index eb067ea38e08cbd41c6a8121d24d3bfdc3ba81ca..fba31e47a6c3ce8bee637f07cc4bf5dcce966124 100644 (file)
--- a/src/game/g_textures.pas
+++ b/src/game/g_textures.pas
+{$MODE DELPHI}
unit g_textures;
interface
unit g_textures;
interface
implementation
uses
implementation
uses
- g_game, e_log, g_basic, SysUtils, g_console, WADEDITOR,
+ g_game, e_log, g_basic, SysUtils, g_console, wadreader,
g_language;
type
g_language;
type
function g_Texture_CreateWAD(var ID: DWORD; Resource: String): Boolean;
var
function g_Texture_CreateWAD(var ID: DWORD; Resource: String): Boolean;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
FileName,
SectionName,
ResourceName: String;
FileName,
SectionName,
ResourceName: String;
Result := False;
g_ProcessResourceStr(Resource, FileName, SectionName, ResourceName);
Result := False;
g_ProcessResourceStr(Resource, FileName, SectionName, ResourceName);
- WAD := TWADEditor_1.Create;
+ WAD := TWADFile.Create;
WAD.ReadFile(FileName);
if WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then
WAD.ReadFile(FileName);
if WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then
else
begin
e_WriteLog(Format('Error loading texture %s', [Resource]), MSG_WARNING);
else
begin
e_WriteLog(Format('Error loading texture %s', [Resource]), MSG_WARNING);
- e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
end;
WAD.Free();
end;
end;
WAD.Free();
end;
function g_Texture_CreateWADEx(TextureName: ShortString; Resource: String): Boolean;
var
function g_Texture_CreateWADEx(TextureName: ShortString; Resource: String): Boolean;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
FileName,
SectionName,
ResourceName: String;
FileName,
SectionName,
ResourceName: String;
find_id := FindTexture();
find_id := FindTexture();
- WAD := TWADEditor_1.Create;
+ WAD := TWADFile.Create;
WAD.ReadFile(FileName);
if WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then
WAD.ReadFile(FileName);
if WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then
else
begin
e_WriteLog(Format('Error loading texture %s', [Resource]), MSG_WARNING);
else
begin
e_WriteLog(Format('Error loading texture %s', [Resource]), MSG_WARNING);
- e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
Result := False;
end;
WAD.Free();
Result := False;
end;
WAD.Free();
function g_Frames_CreateWAD(ID: PDWORD; Name: ShortString; Resource: string;
FWidth, FHeight, FCount: Word; BackAnimation: Boolean = False): Boolean;
var
function g_Frames_CreateWAD(ID: PDWORD; Name: ShortString; Resource: string;
FWidth, FHeight, FCount: Word; BackAnimation: Boolean = False): Boolean;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
FileName,
SectionName,
ResourceName: string;
FileName,
SectionName,
ResourceName: string;
g_ProcessResourceStr(Resource, FileName, SectionName, ResourceName);
g_ProcessResourceStr(Resource, FileName, SectionName, ResourceName);
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
WAD.ReadFile(FileName);
if not WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then
begin
WAD.Free();
e_WriteLog(Format('Error loading texture %s', [Resource]), MSG_WARNING);
WAD.ReadFile(FileName);
if not WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then
begin
WAD.Free();
e_WriteLog(Format('Error loading texture %s', [Resource]), MSG_WARNING);
- e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
Exit;
end;
Exit;
end;