diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 95bb1a02fd813f82536e759ee6a2b0cfa1f86f8c..e99d47b19186dd65974751d9a2dd3e90539e3439 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
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: 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)
+ if g_Game_IsClient then result := g_Res_FindReplacementWad(WadName);
+ if (result = WadName) then result := e_FindWad(WadDirs, result)
end;
end;
-function CreateTexture(RecName: AnsiString; Map: string; log: Boolean): Integer;
+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;
// Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
WADName := GetReplacementWad(g_ExtractWadName(RecName));
+ if (WADName <> '') then addResToExternalResList(WADName);
if WADName = '' then WADName := Map; //WADName := GameDir+'/wads/'+WADName else
WAD := TWADFile.Create();
// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
WADName := GetReplacementWad(g_ExtractWadName(RecName));
+ if (WADName <> '') then addResToExternalResList(WADName);
if WADName = '' then WADName := Map; //WADName := GameDir+'/wads/'+WADName else
WAD := TWADFile.Create();
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: 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;
- // add new resource
- fi.userName := uname;
- if (not GetDiskFileInfo(GameDir+'/wads/'+res, fi)) then
- begin
- fi.tag := -1;
- end
- else
- begin
- 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;
-
-
-procedure generateExternalResourcesList (map: TDynRecord);
-begin
- SetLength(gExternalResources, 0);
- addResToExternalResList(map.MusicName);
- addResToExternalResList(map.SkyName);
-end;
-
-
procedure mapCreateGrid ();
var
mapX0: Integer = $3fffffff;
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
- begin
- ntn := CreateNullTexture(rec.Resource);
- end
- else
- begin
- addResToExternalResList(rec.Resource);
- end;
+ if (ntn < 0) then ntn := CreateNullTexture(rec.Resource);
rec.tagInt := ntn; // remember texture number
end;