diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index e2612f454e3c624895f54eb0c6ae7dce431622ec..2b8e9ff34d5875ab0042b71f15b9936bfb680e97 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
-(* 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
*
* 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.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
interface
uses
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
type
TMapInfo = record
CaptureTime: LongWord;
Animation: TAnimation;
Direction: TDirection;
CaptureTime: LongWord;
Animation: TAnimation;
Direction: TDirection;
+ NeedSend: Boolean;
end;
function g_Map_Load(Res: String): Boolean;
function g_Map_GetMapInfo(Res: String): TMapInfo;
end;
function g_Map_Load(Res: String): Boolean;
function g_Map_GetMapInfo(Res: String): TMapInfo;
-function g_Map_GetMapsList(WADName: String): SArray;
+function g_Map_GetMapsList(WADName: String): SSArray;
function g_Map_Exist(Res: String): Boolean;
procedure g_Map_Free(freeTextures: Boolean=true);
procedure g_Map_Update();
function g_Map_Exist(Res: String): Boolean;
procedure g_Map_Free(freeTextures: Boolean=true);
procedure g_Map_Update();
procedure g_Map_DisableWall_XXX (ID: DWORD);
procedure g_Map_SetLift_XXX (ID: DWORD; t: Integer);
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;
function g_Map_GetPoint(PointType: Byte; var RespawnPoint: TRespawnPoint): Boolean;
function g_Map_GetPointCount(PointType: Byte): Word;
procedure g_Map_ReAdd_DieTriggers();
function g_Map_IsSpecialTexture(Texture: String): Boolean;
function g_Map_GetPoint(PointType: Byte; var RespawnPoint: TRespawnPoint): Boolean;
function g_Map_GetPointCount(PointType: Byte): Word;
+function g_Map_GetRandomPointType(): Byte;
function g_Map_HaveFlagPoints(): Boolean;
procedure g_Map_ResetFlag(Flag: Byte);
procedure g_Map_DrawFlags();
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);
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
GridTagLift = 1 shl 8; // gLifts
GridTagBlockMon = 1 shl 9; // gBlockMon
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);
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<TPanel, TBinHeapPanelDrawCmp>;
+
var
gWalls: TPanelArray;
gRenderBackgrounds: TPanelArray;
var
gWalls: TPanelArray;
gRenderBackgrounds: TPanelArray;
gLiftMap: array of array of DWORD;
gWADHash: TMD5Digest;
BackID: DWORD = DWORD(-1);
gLiftMap: array of array of DWORD;
gWADHash: TMD5Digest;
BackID: DWORD = DWORD(-1);
- gExternalResources: TStringList;
+ gExternalResources: array of TDiskFileInfo = nil;
gMovingWallIds: array of Integer = nil;
gdbg_map_use_accel_render: Boolean = true;
gdbg_map_use_accel_coldet: Boolean = true;
profMapCollision: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY!
gMovingWallIds: array of Integer = nil;
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
gCurrentMap: TDynRecord = nil;
gCurrentMapFileName: AnsiString = ''; // so we can skip texture reloading
+ gTestMap: String = '';
function panelTypeToTag (panelType: Word): Integer; // returns GridTagXXX
function panelTypeToTag (panelType: Word): Integer; // returns GridTagXXX
implementation
uses
implementation
uses
- e_input, g_main, e_log, 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, e_res, 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,
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,
ImagingTypes, Imaging, ImagingUtility,
- ImagingGif, ImagingNetworkGraphics;
+ ImagingGif, ImagingNetworkGraphics,
+ g_res_downloader;
const
FLAGRECT: TRectWH = (X:15; Y:12; Width:33; Height:52);
const
FLAGRECT: TRectWH = (X:15; Y:12; Width:33; Height:52);
FLAG_SIGNATURE = $47414C46; // 'FLAG'
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;
var
panByGUID: array of TPanel = nil;
try
e_LogWritefln('parsing "mapdef.txt"...', []);
try
e_LogWritefln('parsing "mapdef.txt"...', []);
- st := openDiskFileRO(DataDir+'mapdef.txt');
- e_LogWritefln('found local "%smapdef.txt"', [DataDir]);
+ st := e_OpenResourceRO(DataDirs, 'mapdef.txt');
+ e_LogWritefln('found local "mapdef.txt"', []);
except
st := nil;
end;
except
st := nil;
end;
// ////////////////////////////////////////////////////////////////////////// //
var
NNF_PureName: String; // Èìÿ òåêñòóðû áåç öèôð â êîíöå
// ////////////////////////////////////////////////////////////////////////// //
var
NNF_PureName: String; // Èìÿ òåêñòóðû áåç öèôð â êîíöå
+ NNF_PureExt: String; // extension postfix
NNF_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû
NNF_CurrentNum: Integer; // Ñëåäóþùåå ÷èñëî ó òåêñòóðû
function g_Texture_NumNameFindStart(name: String): Boolean;
var
NNF_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû
NNF_CurrentNum: Integer; // Ñëåäóþùåå ÷èñëî ó òåêñòóðû
function g_Texture_NumNameFindStart(name: String): Boolean;
var
- i: Integer;
+ i, j: Integer;
begin
Result := False;
NNF_PureName := '';
begin
Result := False;
NNF_PureName := '';
+ NNF_PureExt := '';
NNF_FirstNum := -1;
NNF_CurrentNum := -1;
NNF_FirstNum := -1;
NNF_CurrentNum := -1;
end
else
begin
end
else
begin
+ j := i + 1;
+ while (j <= Length(name)) and (name[j] <> '.') do inc(j);
NNF_PureName := Copy(name, 1, i);
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;
Break;
end;
end;
Exit;
end;
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
if NNF_CurrentNum < NNF_FirstNum then
Result := NNF_NAME_BEFORE
end;
end;
-function dplLess (a, b: TObject): Boolean;
-var
- pa, pb: TPanel;
+class function TBinHeapPanelDrawCmp.less (const a, b: TPanel): Boolean; inline;
begin
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
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;
end;
procedure g_Map_ProfilersBegin ();
begin
if (profMapCollision = nil) then profMapCollision := TProfiler.Create('COLSOLID', g_profile_history_size);
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
// create sections
- if g_profile_collision then
+ if g_profile_collision and (profMapCollision <> nil) then
begin
profMapCollision.sectionBegin('*solids');
profMapCollision.sectionEnd();
begin
profMapCollision.sectionBegin('*solids');
profMapCollision.sectionEnd();
var
ex, ey: Integer;
begin
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;
if (result <> nil) then
begin
if (hitx <> nil) then hitx^ := ex;
@@ -559,7 +589,7 @@ function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInt
var
ex, ey: Integer;
begin
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;
if (result <> nil) then
begin
if (hitx <> nil) then hitx^ := ex;
end;
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;
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;
var
tagmask: Integer = 0;
+ mwit: PPanel;
+ it: TPanelGrid.Iter;
begin
result := false;
begin
result := false;
if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon;
if (tagmask = 0) then exit;// just in case
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
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
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;
end;
+ it.release();
end;
function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel;
end;
function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel;
+var
+ it: TPanelGrid.Iter;
begin
result := nil;
if (tagmask = 0) then exit;
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;
end;
function CreateNullTexture(RecName: String): Integer;
begin
RecName := toLowerCase1251(RecName);
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);
if TextNameHash.get(RecName, result) then exit; // i found her!
SetLength(Textures, Length(Textures)+1);
end;
end;
-function CreateTexture(RecName: AnsiString; Map: string; log: Boolean): Integer;
+function extractWadName (resourceName: string): string;
+var
+ posN: Integer;
+begin
+ posN := Pos(':', resourceName);
+ if posN > 0 then
+ Result:= Copy(resourceName, 0, posN-1)
+ else
+ Result := '';
+end;
+
+
+procedure addResToExternalResList (res: AnsiString);
+var
+ uname: AnsiString;
+ f: Integer;
+ fi: TDiskFileInfo;
+begin
+ if g_Game_IsClient or not g_Game_IsNet then exit;
+ if (length(res) = 0) then exit; // map wad
+ //res := extractWadName(res);
+ //if (length(res) = 0) then exit; // map wad
+ uname := toLowerCase1251(res);
+ // do not add duplicates
+ for f := 0 to High(gExternalResources) do
+ begin
+ if (gExternalResources[f].userName = uname) then exit;
+ end;
+ //writeln('***(000) addResToExternalResList: res=[', res, ']');
+ // add new resource
+ fi.userName := uname;
+ if not findFileCI(res) then exit;
+ //writeln('***(001) addResToExternalResList: res=[', res, ']');
+ fi.diskName := res;
+ if (not GetDiskFileInfo(res, fi)) then
+ begin
+ fi.tag := -1;
+ end
+ else
+ begin
+ //writeln('***(002) addResToExternalResList: res=[', res, ']');
+ fi.tag := 0; // non-zero means "cannot caclucate hash"
+ try
+ fi.hash := MD5File(fi.diskName);
+ except
+ fi.tag := -1;
+ end;
+ end;
+ //e_LogWritefln('addext: res=[%s]; uname=[%s]; diskName=[%s]', [res, fi.userName, fi.diskName]);
+ SetLength(gExternalResources, length(gExternalResources)+1);
+ gExternalResources[High(gExternalResources)] := fi;
+end;
+
+
+procedure compactExtResList ();
+var
+ src, dest: Integer;
+begin
+ src := 0;
+ dest := 0;
+ for src := 0 to High(gExternalResources) do
+ begin
+ if (gExternalResources[src].tag = 0) then
+ begin
+ // copy it
+ if (dest <> src) then gExternalResources[dest] := gExternalResources[src];
+ Inc(dest);
+ end;
+ end;
+ if (dest <> length(gExternalResources)) then SetLength(gExternalResources, dest);
+end;
+
+
+function GetReplacementWad (WadName: AnsiString): AnsiString;
+begin
+ result := '';
+ if WadName <> '' then
+ begin
+ result := WadName;
+ if g_Game_IsClient then result := g_Res_FindReplacementWad(WadName);
+ if (result = WadName) then result := e_FindWad(WadDirs, result)
+ end;
+end;
+
+
+procedure generateExternalResourcesList (map: TDynRecord);
+begin
+ SetLength(gExternalResources, 0);
+ addResToExternalResList(GetReplacementWad(g_ExtractWadName(map.MusicName)));
+ addResToExternalResList(GetReplacementWad(g_ExtractWadName(map.SkyName)));
+end;
+
+
+function CreateTexture (RecName: AnsiString; Map: string; log: Boolean): Integer;
var
WAD: TWADFile;
TextureData: Pointer;
var
WAD: TWADFile;
TextureData: Pointer;
a, ResLength: Integer;
begin
RecName := toLowerCase1251(RecName);
a, ResLength: 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!
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;
exit;
end;
end;
// Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
end;
// Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
- WADName := g_ExtractWadName(RecName);
+ WADName := GetReplacementWad(g_ExtractWadName(RecName));
+ if (WADName <> '') then addResToExternalResList(WADName);
+ if WADName = '' then WADName := Map; //WADName := GameDir+'/wads/'+WADName else
WAD := TWADFile.Create();
WAD := TWADFile.Create();
-
- if WADName <> '' then WADName := GameDir+'/wads/'+WADName else WADName := Map;
-
WAD.ReadFile(WADName);
//txname := RecName;
WAD.ReadFile(WADName);
//txname := RecName;
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
+ e_WriteLog(Format('Error loading texture %s', [RecName]), TMsgType.Warning);
SetLength(Textures, Length(Textures)-1);
SetLength(Textures, Length(Textures)-1);
+ result := -1;
Exit;
end;
e_GetTextureSize(Textures[High(Textures)].TextureID, @Textures[High(Textures)].Width, @Textures[High(Textures)].Height);
Exit;
end;
e_GetTextureSize(Textures[High(Textures)].TextureID, @Textures[High(Textures)].Width, @Textures[High(Textures)].Height);
else // Íåò òàêîãî ðåóñðñà â WAD'å
begin
//e_WriteLog(Format('SHIT! Error loading texture %s : %s', [RecName, g_ExtractFilePathName(RecName)]), MSG_WARNING);
else // Íåò òàêîãî ðåóñðñà â WAD'å
begin
//e_WriteLog(Format('SHIT! Error loading texture %s : %s', [RecName, g_ExtractFilePathName(RecName)]), MSG_WARNING);
- if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create();
if log and (not BadTextNameHash.get(RecName, a)) then
begin
if log and (not BadTextNameHash.get(RecName, a)) then
begin
- e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING);
+ e_WriteLog(Format('Error loading texture %s', [RecName]), TMsgType.Warning);
//e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
end;
BadTextNameHash.put(RecName, -1);
//e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
end;
BadTextNameHash.put(RecName, -1);
f, c, frdelay, frloop: Integer;
begin
RecName := toLowerCase1251(RecName);
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!
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;
exit;
end;
//e_LogWritefln('*** Loading animated texture "%s"', [RecName]);
//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);
if BadTextNameHash.get(RecName, f) then
begin
//e_WriteLog(Format('no animation texture %s (don''t worry)', [RecName]), MSG_NOTIFY);
end;
// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
end;
// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
- WADName := g_ExtractWadName(RecName);
+ WADName := GetReplacementWad(g_ExtractWadName(RecName));
+ if (WADName <> '') then addResToExternalResList(WADName);
+ if WADName = '' then WADName := Map; //WADName := GameDir+'/wads/'+WADName else
WAD := TWADFile.Create();
try
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, log) then
begin
WAD.ReadFile(WADName);
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
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);
//e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
end;
BadTextNameHash.put(RecName, -1);
if ResLength < 6 then
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;
// ýòî ïòèöà? ýòî ñàìîë¸ò?
BadTextNameHash.put(RecName, -1);
exit;
end;
// ýòî ïòèöà? ýòî ñàìîë¸ò?
- if (TextureWAD[0] = 'D') and (TextureWAD[1] = 'F') and
- (TextureWAD[2] = 'W') and (TextureWAD[3] = 'A') and (TextureWAD[4] = 'D') then
+ if isWadData(TextureWAD, ResLength) then
begin
// íåò, ýòî ñóïåðìåí!
if not WAD.ReadMemory(TextureWAD, ResLength) then
begin
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;
BadTextNameHash.put(RecName, -1);
exit;
end;
// ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè:
if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then
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;
BadTextNameHash.put(RecName, -1);
exit;
end;
TextureResource := cfg.ReadStr('', 'resource', '');
if TextureResource = '' then
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;
BadTextNameHash.put(RecName, -1);
exit;
end;
// ×èòàåì ðåñóðñ òåêñòóð (êàäðîâ) àíèì. òåêñòóðû â ïàìÿòü:
if not WAD.GetResource('TEXTURES/'+TextureResource, TextureData, ResLength) then
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;
BadTextNameHash.put(RecName, -1);
exit;
end;
end
else
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
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;
end;
BadTextNameHash.put(RecName, -1);
end;
GlobalMetadata.ClearMetaItemsForSaving();
if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then
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
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;
BadTextNameHash.put(RecName, -1);
exit;
end;
//writeln(' creating animated texture with ', length(ia), ' frames (delay:', _speed, '; backloop:', _backanimation, ') from "', RecName, '"...');
//for f := 0 to high(ia) do writeln(' frame #', f, ': ', ia[f].width, 'x', ia[f].height);
f := ord(_backanimation);
//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îçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê
SetLength(Textures, Length(Textures)+1);
// cîçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê
end
else
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
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;
end;
BadTextNameHash.put(RecName, -1);
end;
end;
end;
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;
var
_trigger: TTrigger;
+ tp: TPanel;
begin
result := -1;
if g_Game_IsClient and not (Trigger.TriggerType in [TRIGGER_SOUND, TRIGGER_MUSIC]) then Exit;
begin
result := -1;
if g_Game_IsClient and not (Trigger.TriggerType in [TRIGGER_SOUND, TRIGGER_MUSIC]) then Exit;
Width := Trigger.Width;
Height := Trigger.Height;
Enabled := Trigger.Enabled;
Width := Trigger.Width;
Height := Trigger.Height;
Enabled := Trigger.Enabled;
- //TexturePanel := Trigger.TexturePanel;
TexturePanelGUID := atpanid;
TexturePanelGUID := atpanid;
- TexturePanelType := fTexturePanel1Type;
- ShotPanelType := fTexturePanel2Type;
TriggerType := Trigger.TriggerType;
ActivateType := Trigger.ActivateType;
Keys := Trigger.Keys;
trigPanelGUID := atrigpanid;
TriggerType := Trigger.TriggerType;
ActivateType := Trigger.ActivateType;
Keys := Trigger.Keys;
trigPanelGUID := atrigpanid;
- //trigShotPanelId := ashotpanid;
- //Data.Default := Trigger.DATA;
- if (Trigger.trigRec = nil) then
+ // HACK: used in TPanel.CanChangeTexture. maybe there's a better way?
+ if TexturePanelGUID <> -1 then
begin
begin
- trigDataRec := nil;
- //HACK!
- if (TriggerType <> TRIGGER_SECRET) then
- begin
- e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [TriggerType], MSG_WARNING);
- end;
- end
- else
- begin
- trigDataRec := Trigger.trigRec.clone(nil);
+ tp := g_Map_PanelByGUID(TexturePanelGUID);
+ if (tp <> nil) then tp.hasTexTrigger := True;
end;
end;
end;
end;
- result := Integer(g_Triggers_Create(_trigger));
+ result := Integer(g_Triggers_Create(_trigger, Trigger));
end;
procedure CreateMonster(monster: TDynRecord);
end;
procedure CreateMonster(monster: TDynRecord);
g_Mons_ForEach(monsDieTrig);
end;
g_Mons_ForEach(monsDieTrig);
end;
-function extractWadName(resourceName: string): string;
-var
- posN: Integer;
-begin
- posN := Pos(':', resourceName);
- if posN > 0 then
- Result:= Copy(resourceName, 0, posN-1)
- else
- Result := '';
-end;
-
-procedure addResToExternalResList(res: string);
-begin
- res := extractWadName(res);
- if (res <> '') and (gExternalResources.IndexOf(res) = -1) then
- gExternalResources.Add(res);
-end;
-
-procedure generateExternalResourcesList({mapReader: TMapReader_1}map: TDynRecord);
-//var
- //textures: TTexturesRec1Array;
- //textures: TDynField;
- //trec: TDynRecord;
- //mapHeader: TMapHeaderRec_1;
- //i: integer;
- //resFile: String = '';
-begin
- if gExternalResources = nil then
- gExternalResources := TStringList.Create;
-
- gExternalResources.Clear;
-
- (*
- {
- textures := GetTextures(map);
- for i := 0 to High(textures) do
- begin
- addResToExternalResList(resFile);
- end;
- }
-
- textures := map['texture'];
- if (textures <> nil) then
- begin
- for trec in textures do
- begin
- addResToExternalResList(resFile);
- end;
- end;
-
- textures := nil;
- *)
-
- //mapHeader := GetMapHeader(map);
-
- addResToExternalResList(map.MusicName);
- addResToExternalResList(map.SkyName);
-end;
-
-
procedure mapCreateGrid ();
var
mapX0: Integer = $3fffffff;
procedure mapCreateGrid ();
var
mapX0: Integer = $3fffffff;
if (pan.proxyId <> -1) then
begin
{$IF DEFINED(D2F_DEBUG)}
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;
{$ENDIF}
continue;
end;
actPanel: TDynRecord;
end;
var
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;
mapTextureList: TDynField = nil; //TTexturesRec1Array; tagInt: texture index
panels: TDynField = nil; //TPanelsRec1Array;
items: TDynField = nil; //TItemsRec1Array;
PanelID: DWORD;
AddTextures: TAddTextureArray;
TriggersTable: array of TTRec;
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;
Data: Pointer;
Len: Integer;
ok, isAnim: Boolean;
moveSpeed{, moveStart, moveEnd}: TDFPoint;
//moveActive: Boolean;
pan: TPanel;
moveSpeed{, moveStart, moveEnd}: TDFPoint;
//moveActive: Boolean;
pan: TPanel;
+ mapOk: Boolean = false;
+ usedTextures: THashStrInt = nil; // key: mapTextureList
begin
mapGrid.Free();
mapGrid := nil;
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;
panByGUID := nil;
Result := False;
gMapInfo.Map := Res;
TriggersTable := nil;
- mapReader := nil;
+ //mapReader := nil;
sfsGCDisable(); // temporary disable removing of temporary volumes
try
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
begin
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName]));
- WAD.Free();
- Exit;
- end;
+ FileName := g_ExtractWadName(Res);
+ e_LogWritefln('Loading map WAD [%s] (res=[%s])', [FileName, Res], 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();
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 := curTimeMicro();
+ 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);
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
begin
- e_LogWritefln('invalid map file: ''%s''', [mapResName]);
- exit;
+ stt := getTimeMicro();
end;
end;
- generateExternalResourcesList(mapReader);
- mapTextureList := mapReader['texture'];
+ //gCurrentMap := mapReader;
+
+ generateExternalResourcesList(gCurrentMap);
+ mapTextureList := gCurrentMap['texture'];
// get all other lists here too
// 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
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;
// Çàãðóçêà òåêñòóð:
end;
// Çàãðóçêà òåêñòóð:
// Äîáàâëåíèå òåêñòóð â Textures[]:
if (mapTextureList <> nil) and (mapTextureList.count > 0) then
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);
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
- begin
- // Àíèìèðîâàííàÿ òåêñòóðà
- ntn := CreateAnimTexture(rec.Resource, FileName, True);
- if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [s]));
- end
- else
+ // find used textures
+ usedTextures := THashStrInt.Create();
+ try
+ if (panels <> nil) and (panels.count > 0) then
begin
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;
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
end;
// set panel tagInt to texture index
end;
end;
end;
end;
+
// Çàãðóçêà òðèããåðîâ
gTriggerClientID := 0;
// Çàãðóçêà òðèããåðîâ
gTriggerClientID := 0;
- e_WriteLog(' Loading triggers...', MSG_NOTIFY);
+ e_WriteLog(' Loading triggers...', TMsgType.Notify);
g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS], 0, False);
// Çàãðóçêà ïàíåëåé
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
g_Game_SetLoadingText(_lc[I_LOAD_PANELS], 0, False);
// check texture numbers for panels
begin
if (rec.tagInt < 0) then
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;
result := false;
+ gCurrentMap.Free();
+ gCurrentMap := nil;
+ gCurrentMapFileName := '';
exit;
end;
end;
exit;
end;
end;
// Ñîçäàíèå òàáëèöû òðèããåðîâ (ñîîòâåòñòâèå ïàíåëåé òðèããåðàì)
if (triggers <> nil) and (triggers.count > 0) then
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);
//SetLength(TriggersTable, triggers.count);
g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS_TABLE], triggers.count-1, False);
// Ñîçäàåì ïàíåëè
if (panels <> nil) and (panels.count > 0) then
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;
g_Game_SetLoadingText(_lc[I_LOAD_LINK_TRIGGERS], panels.count-1, False);
pannum := -1;
//e_LogWritefln('PANADD: pannum=%s', [pannum]);
// Ñîçäàåì ïàíåëü è çàïîìèíàåì åå GUID
//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
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
end;
// create map grid, init other grids (for monsters, for example)
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, òî ñîçäàåì òðèããåðû
mapCreateGrid();
// Åñëè íå LoadState, òî ñîçäàåì òðèããåðû
for rec in triggers do
begin
Inc(trignum);
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;
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;
end;
end;
end;
// Çàãðóçêà ïðåäìåòîâ
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
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;
// Çàãðóçêà îáëàñòåé
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
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;
// Çàãðóçêà ìîíñòðîâ
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;
g_Game_SetLoadingText(_lc[I_LOAD_MONSTERS], 0, False);
gTotalMonsters := 0;
// Åñëè íå LoadState, òî ñîçäàåì ìîíñòðîâ
if (monsters <> nil) and not gLoadGameMode then
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;
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;
gCurrentMapFileName := Res;
- mapReader := nil;
+ //mapReader := nil;
// Çàãðóçêà íåáà
// Çàãðóçêà íåáà
- if gMapInfo.SkyName <> '' then
+ if (gMapInfo.SkyName <> '') then
begin
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);
g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False);
- FileName := g_ExtractWadName(gMapInfo.SkyName);
-
- if FileName <> '' then
- FileName := GameDir+'/wads/'+FileName
- else
- begin
- FileName := g_ExtractWadName(Res);
- end;
-
- s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName);
- if g_Texture_CreateWAD(BackID, s) then
- begin
- g_Game_SetupScreenSize();
- end
- else
- g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]));
+ if gTextureFilter then TEXTUREFILTER := GL_LINEAR else TEXTUREFILTER := GL_NEAREST;
+ try
+ s := e_GetResourcePath(WadDirs, gMapInfo.SkyName, g_ExtractWadName(Res));
+ if g_Texture_CreateWAD(BackID, s) then
+ g_Game_SetupScreenSize
+ else
+ g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]))
+ finally
+ TEXTUREFILTER := GL_NEAREST;
+ end;
end;
// Çàãðóçêà ìóçûêè
ok := False;
if gMapInfo.MusicName <> '' then
begin
end;
// Çàãðóçêà ìóçûêè
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);
g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False);
- FileName := g_ExtractWadName(gMapInfo.MusicName);
-
- if FileName <> '' then
- FileName := GameDir+'/wads/'+FileName
- else
- begin
- FileName := g_ExtractWadName(Res);
- end;
- s := FileName+':'+g_ExtractFilePathName(gMapInfo.MusicName);
+ s := e_GetResourcePath(WadDirs, gMapInfo.MusicName, g_ExtractWadName(Res));
if g_Sound_CreateWADEx(gMapInfo.MusicName, s, True) then
ok := True
else
if g_Sound_CreateWADEx(gMapInfo.MusicName, s, True) then
ok := True
else
gMusic.SetByName('');
end;
gMusic.SetByName('');
end;
- stt := curTimeMicro()-stt;
+ stt := getTimeMicro()-stt;
e_LogWritefln('map loaded in %s.%s milliseconds', [Integer(stt div 1000), Integer(stt mod 1000)]);
e_LogWritefln('map loaded in %s.%s milliseconds', [Integer(stt div 1000), Integer(stt mod 1000)]);
+ mapOk := true;
finally
sfsGCEnable(); // enable releasing unused volumes
finally
sfsGCEnable(); // enable releasing unused volumes
- mapReader.Free();
- e_ClearInputBuffer(); // why not?
+ //mapReader.Free();
+ e_UnpressAllKeys; // why not?
+ if not mapOk then
+ begin
+ gCurrentMap.Free();
+ gCurrentMap := nil;
+ gCurrentMapFileName := '';
+ end;
end;
end;
- e_WriteLog('Done loading map.', MSG_NOTIFY);
+ compactExtResList();
+ e_WriteLog('Done loading map.', TMsgType.Notify);
Result := True;
end;
Result := True;
end;
mapReader.Free();
end;
mapReader.Free();
end;
-function g_Map_GetMapsList(WADName: string): SArray;
+function g_Map_GetMapsList(WADName: string): SSArray;
var
WAD: TWADFile;
a: Integer;
var
WAD: TWADFile;
a: Integer;
- ResList: SArray;
+ ResList: SSArray;
begin
Result := nil;
WAD := TWADFile.Create();
begin
Result := nil;
WAD := TWADFile.Create();
var
WAD: TWADFile;
FileName, mnn: string;
var
WAD: TWADFile;
FileName, mnn: string;
- ResList: SArray;
+ ResList: SSArray;
a: Integer;
begin
Result := False;
a: Integer;
begin
Result := False;
begin
e_LogWritefln('g_Map_Free: no previous map.', []);
end;
begin
e_LogWritefln('g_Map_Free: no previous map.', []);
end;
+
if freeTextures then
begin
e_LogWritefln('g_Map_Free: clearing textures...', []);
if freeTextures then
begin
e_LogWritefln('g_Map_Free: clearing textures...', []);
TextNameHash := nil;
BadTextNameHash.Free();
BadTextNameHash := nil;
TextNameHash := nil;
BadTextNameHash.Free();
BadTextNameHash := nil;
+ gCurrentMapFileName := '';
+ gCurrentMap.Free();
+ gCurrentMap := nil;
end;
panByGUID := nil;
end;
panByGUID := nil;
a, d, j: Integer;
m: Word;
s: String;
a, d, j: Integer;
m: Word;
s: String;
+ b: Byte;
procedure UpdatePanelArray(var panels: TPanelArray);
var
procedure UpdatePanelArray(var panels: TPanelArray);
var
begin
if gFlags[a].Animation <> nil then gFlags[a].Animation.Update();
begin
if gFlags[a].Animation <> nil then gFlags[a].Animation.Update();
+ Obj.oldX := Obj.X;
+ Obj.oldY := Obj.Y;
+
m := g_Obj_Move(@Obj, True, True);
m := g_Obj_Move(@Obj, True, True);
+ NeedSend := NeedSend or (Obj.X <> Obj.oldX) or (Obj.Y <> Obj.oldY);
+
if gTime mod (GAME_TICK*2) <> 0 then Continue;
// Ñîïðîòèâëåíèå âîçäóõà
if gTime mod (GAME_TICK*2) <> 0 then Continue;
// Ñîïðîòèâëåíèå âîçäóõà
s := _lc[I_PLAYER_FLAG_BLUE];
g_Game_Message(Format(_lc[I_MESSAGE_FLAG_RETURN], [AnsiUpperCase(s)]), 144);
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;
if g_Game_IsNet then
MH_SEND_FlagEvent(FLAG_STATE_RETURNED, a, 0);
Continue;
// new algo
procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer);
// 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();
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;
// 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
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;
end;
h := High(gLifts);
for a := 0 to h do
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
g_Collide(X, Y, Width, Height,
gLifts[a].X, gLifts[a].Y,
gLifts[a].Width, gLifts[a].Height) then
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean;
const
SlowMask = GridTagLift or GridTagBlockMon;
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
{
function checker (pan: TPanel; tag: Integer): Boolean;
begin
{
if ((tag and GridTagLift) <> 0) then
begin
result :=
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;
g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)};
exit;
end;
var
tagmask: Integer = 0;
var
tagmask: Integer = 0;
+ mwit: PPanel;
+ it: TPanelGrid.Iter;
+ pan: TPanel;
begin
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;
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;
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 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 (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
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
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
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;
end;
+ it.release();
end
else
begin
end
else
begin
end;
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
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
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
end
else
begin
end;
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;
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;
tp.NextTexture(AnimLoop);
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid, AnimLoop);
end;
//TODO: make separate lift tags, and change tag here
case LiftType of
//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);
end;
//if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pguid);
Result := Result + 1;
end;
Result := Result + 1;
end;
+function g_Map_GetRandomPointType(): Byte;
+begin
+ if RespawnPoints = nil then
+ Result := 255
+ else
+ Result := RespawnPoints[Random(Length(RespawnPoints))].PointType;
+end;
+
function g_Map_HaveFlagPoints(): Boolean;
begin
Result := (FlagPoints[FLAG_RED] <> nil) and (FlagPoints[FLAG_BLUE] <> nil);
function g_Map_HaveFlagPoints(): Boolean;
begin
Result := (FlagPoints[FLAG_RED] <> nil) and (FlagPoints[FLAG_BLUE] <> nil);
Obj.Y := -1000;
Obj.Vel.X := 0;
Obj.Vel.Y := 0;
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
State := FLAG_STATE_NONE;
if FlagPoints[Flag] <> nil then
begin
Direction := FlagPoints[Flag]^.Direction;
State := FLAG_STATE_NORMAL;
end;
Direction := FlagPoints[Flag]^.Direction;
State := FLAG_STATE_NORMAL;
end;
+ Obj.oldX := Obj.X;
+ Obj.oldY := Obj.Y;
+ NeedSend := False; // the event will take care of this
Count := -1;
end;
end;
Count := -1;
end;
end;
procedure g_Map_DrawFlags();
var
i, dx: Integer;
procedure g_Map_DrawFlags();
var
i, dx: Integer;
+ tx, ty: Integer;
Mirror: TMirrorType;
begin
if gGameSettings.GameMode <> GM_CTF then
Mirror: TMirrorType;
begin
if gGameSettings.GameMode <> GM_CTF then
if State = FLAG_STATE_NONE then
continue;
if State = FLAG_STATE_NONE then
continue;
- if Direction = D_LEFT then
+ Obj.lerp(gLerpFactor, tx, ty);
+
+ if Direction = TDirection.D_LEFT then
begin
begin
- Mirror := M_HORIZONTAL;
+ Mirror := TMirrorType.Horizontal;
dx := -1;
end
else
begin
dx := -1;
end
else
begin
- Mirror := M_NONE;
+ Mirror := TMirrorType.None;
dx := 1;
end;
dx := 1;
end;
- Animation.Draw(Obj.X+dx, Obj.Y+1, Mirror);
+ Animation.Draw(tx+dx, ty+1, Mirror);
if g_debug_Frames then
begin
if g_debug_Frames then
begin
end;
end;
-procedure g_Map_SaveState (var Mem: TBinMemoryWriter);
+procedure g_Map_SaveState (st: TStream);
var
var
- dw: DWORD;
- b: Byte;
str: String;
str: String;
- boo: Boolean;
procedure savePanels ();
var
procedure savePanels ();
var
- PAMem: TBinMemoryWriter;
pan: TPanel;
pan: TPanel;
- count: Integer;
begin
begin
- // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé
- PAMem := TBinMemoryWriter.Create((Length(panByGUID)+1) * 40);
-
// Ñîõðàíÿåì ïàíåëè
// Ñîõðàíÿåì ïàíåëè
- count := Length(panByGUID);
- Mem.WriteInt(count);
- 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;
end;
- procedure SaveFlag (flag: PFlag);
+ procedure saveFlag (flag: PFlag);
+ var
+ b: Byte;
begin
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
end;
begin
- Mem := TBinMemoryWriter.Create(1024 * 1024); // 1 MB
-
- ///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: /////
savePanels();
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;
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: /////
///// /////
//// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: /////
- if gGameSettings.GameMode = GM_CTF then
+ if (gGameSettings.GameMode = GM_CTF) then
begin
// Ôëàã Êðàñíîé êîìàíäû
begin
// Ôëàã Êðàñíîé êîìàíäû
- SaveFlag(@gFlags[FLAG_RED]);
+ saveFlag(@gFlags[FLAG_RED]);
// Ôëàã Ñèíåé êîìàíäû
// Ôëàã Ñèíåé êîìàíäû
- SaveFlag(@gFlags[FLAG_BLUE]);
+ saveFlag(@gFlags[FLAG_BLUE]);
end;
///// /////
end;
///// /////
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
begin
// Î÷êè Êðàñíîé êîìàíäû
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
begin
// Î÷êè Êðàñíîé êîìàíäû
- Mem.WriteSmallInt(gTeamStat[TEAM_RED].Goals);
+ utils.writeInt(st, SmallInt(gTeamStat[TEAM_RED].Score));
// Î÷êè Ñèíåé êîìàíäû
// Î÷êè Ñèíåé êîìàíäû
- Mem.WriteSmallInt(gTeamStat[TEAM_BLUE].Goals);
+ utils.writeInt(st, SmallInt(gTeamStat[TEAM_BLUE].Score));
end;
///// /////
end;
end;
///// /////
end;
-procedure g_Map_LoadState (var Mem: TBinMemoryReader);
+procedure g_Map_LoadState (st: TStream);
var
dw: DWORD;
var
dw: DWORD;
- b: Byte;
str: String;
boo: Boolean;
procedure loadPanels ();
var
str: String;
boo: Boolean;
procedure loadPanels ();
var
- PAMem: TBinMemoryReader;
pan: TPanel;
pan: TPanel;
- count: LongInt;
begin
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 (Length(panByGUID) <> utils.readLongInt(st)) then raise XStreamError.Create('invalid number of saved panels');
for pan in panByGUID do
begin
for pan in panByGUID do
begin
- pan.LoadState(PAMem);
+ pan.LoadState(st);
if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled;
end;
if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled;
end;
-
- // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí
- PAMem.Free();
end;
end;
- procedure LoadFlag(flag: PFlag);
+ procedure loadFlag (flag: PFlag);
+ var
+ b: Byte;
begin
// Ñèãíàòóðà ôëàãà
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
end;
begin
- if Mem = nil then Exit;
+ if (st = nil) then exit;
///// Çàãðóæàåì ñïèñêè ïàíåëåé: /////
loadPanels();
///// Çàãðóæàåì ñïèñêè ïàíåëåé: /////
loadPanels();
//mapCreateGrid();
///// Çàãðóæàåì ìóçûêó: /////
//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.SetByName(str);
gMusic.SpecPause := boo;
gMusic.Play();
- gMusic.Pause(True);
+ gMusic.Pause(true);
gMusic.SetPosition(dw);
///// /////
///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: /////
gMusic.SetPosition(dw);
///// /////
///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: /////
- Mem.ReadInt(gTotalMonsters);
+ gTotalMonsters := utils.readLongInt(st);
///// /////
//// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: /////
///// /////
//// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: /////
- if gGameSettings.GameMode = GM_CTF then
+ if (gGameSettings.GameMode = GM_CTF) then
begin
// Ôëàã Êðàñíîé êîìàíäû
begin
// Ôëàã Êðàñíîé êîìàíäû
- LoadFlag(@gFlags[FLAG_RED]);
+ loadFlag(@gFlags[FLAG_RED]);
// Ôëàã Ñèíåé êîìàíäû
// Ôëàã Ñèíåé êîìàíäû
- LoadFlag(@gFlags[FLAG_BLUE]);
+ loadFlag(@gFlags[FLAG_BLUE]);
end;
///// /////
end;
///// /////
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
begin
// Î÷êè Êðàñíîé êîìàíäû
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
begin
// Î÷êè Êðàñíîé êîìàíäû
- Mem.ReadSmallInt(gTeamStat[TEAM_RED].Goals);
+ gTeamStat[TEAM_RED].Score := utils.readSmallInt(st);
// Î÷êè Ñèíåé êîìàíäû
// Î÷êè Ñèíåé êîìàíäû
- Mem.ReadSmallInt(gTeamStat[TEAM_BLUE].Goals);
+ gTeamStat[TEAM_BLUE].Score := utils.readSmallInt(st);
end;
///// /////
end;
end;
///// /////
end;
topx := x;
topy := y;
// started outside of the liquid?
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 (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;
topx := x;
topy := y;
end;
end;
+begin
+ DynWarningCB := mapWarningCB;
end.
end.