diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 03c029f6404dad7c884a4647d9752216b9ab6482..54d22a183ba4a224133de8c67d6dbf2b8120bdca 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
function CreateTexture (RecName: AnsiString; Map: String; log: Boolean): Integer;
var
HName: AnsiString;
- WAD, WADz: TWADFile;
+ WAD: TWADFile;
WADName, ResName: String;
- ResData, ReszData: Pointer;
- ResLen, ReszLen: Integer;
- cfg: TConfig;
+ ResData: Pointer;
+ ResLen: Integer;
id: Integer;
begin
Result := -1;
begin
if WAD.GetResource(ResName, ResData, ResLen, log) then
begin
- if IsWadData(ResData, ResLen) then
- begin
- WADz := TWADFile.Create();
- if WADz.ReadMemory(ResData, ResLen) then
- begin
- if WADz.GetResource('TEXT/ANIM', ReszData, ReszLen) then
- begin
- cfg := TConfig.CreateMem(ReszData, ReszLen);
- if cfg <> nil then
- begin
- SetLength(Textures, Length(Textures) + 1);
- Textures[High(Textures)].TextureName := RecName;
- Textures[High(Textures)].FullName := WadName + ':' + ResName;
- Textures[High(Textures)].FramesCount := cfg.ReadInt('', 'framecount', 0);
- Textures[High(Textures)].Speed := cfg.ReadInt('', 'waitcount', 0);
- Result := High(Textures);
- TextNameHash.put(HName, result);
- cfg.Free;
- end;
- FreeMem(ReszData);
- end
- end;
- WADz.Free;
- end
- else
- begin
- SetLength(Textures, Length(Textures) + 1);
- Textures[High(Textures)].FullName := WADName + ':' + ResName;
- Textures[High(Textures)].TextureName := RecName;
- Result := High(Textures);
- TextNameHash.put(HName, result);
- end;
- FreeMem(ResData);
- end
+ SetLength(Textures, Length(Textures) + 1);
+ Textures[High(Textures)].FullName := WADName + ':' + ResName;
+ Textures[High(Textures)].TextureName := RecName;
+ Result := High(Textures);
+ TextNameHash.put(HName, result);
+ end;
+ FreeMem(ResData);
end;
WAD.Free;
end
tp := g_Map_PanelByGUID(pguid);
if (tp = nil) then exit;
tp.NextTexture(AnimLoop);
- if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid, AnimLoop);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid);
end;