diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index de8bc5baae5f0f60e350bc020db24bc15859eb2e..8445e7825e307e89348d740d87c6779970f3362c 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
+{$MODE DELPHI}
unit g_map;
interface
uses
e_graphics, g_basic, MAPSTRUCT, g_textures, Classes,
unit g_map;
interface
uses
e_graphics, g_basic, MAPSTRUCT, g_textures, Classes,
- g_phys, WADEDITOR, BinEditor, g_panel, md5;
+ g_phys, wadreader, BinEditor, g_panel, md5;
type
TMapInfo = record
type
TMapInfo = record
function CreateTexture(RecName: String; Map: string; log: Boolean): Integer;
var
function CreateTexture(RecName: String; Map: string; log: Boolean): Integer;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
TextureData: Pointer;
WADName: String;
SectionName: String;
TextureData: Pointer;
WADName: String;
SectionName: String;
// Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
g_ProcessResourceStr(RecName, WADName, SectionName, TextureName);
// Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
g_ProcessResourceStr(RecName, WADName, SectionName, TextureName);
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
if WADName <> '' then
WADName := GameDir+'/wads/'+WADName
if WADName <> '' then
WADName := GameDir+'/wads/'+WADName
if WAD.GetResource(SectionName, TextureName, TextureData, ResLength) then
begin
SetLength(Textures, Length(Textures)+1);
if WAD.GetResource(SectionName, TextureName, TextureData, ResLength) then
begin
SetLength(Textures, Length(Textures)+1);
- if not e_CreateTextureMem(TextureData, Textures[High(Textures)].TextureID) then
+ if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then
Exit;
e_GetTextureSize(Textures[High(Textures)].TextureID,
@Textures[High(Textures)].Width,
Exit;
e_GetTextureSize(Textures[High(Textures)].TextureID,
@Textures[High(Textures)].Width,
function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer;
var
function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
TextureWAD: Pointer;
TextData: Pointer;
TextureData: Pointer;
TextureWAD: Pointer;
TextData: Pointer;
TextureData: Pointer;
// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
g_ProcessResourceStr(RecName, WADName, SectionName, TextureName);
// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
g_ProcessResourceStr(RecName, WADName, SectionName, TextureName);
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
if WADName <> '' then
WADName := GameDir+'/wads/'+WADName
if WADName <> '' then
WADName := GameDir+'/wads/'+WADName
with Textures[High(Textures)] do
begin
// Ñîçäàåì êàäðû àíèì. òåêñòóðû èç ïàìÿòè:
with Textures[High(Textures)] do
begin
// Ñîçäàåì êàäðû àíèì. òåêñòóðû èç ïàìÿòè:
- if g_Frames_CreateMemory(@FramesID, '', TextureData,
+ if g_Frames_CreateMemory(@FramesID, '', TextureData, ResLength,
_width, _height, _framecount, _backanimation) then
begin
TextureName := RecName;
_width, _height, _framecount, _backanimation) then
begin
TextureName := RecName;
DefaultMusRes = 'Standart.wad:STDMUS\MUS1';
DefaultSkyRes = 'Standart.wad:STDSKY\SKY0';
var
DefaultMusRes = 'Standart.wad:STDMUS\MUS1';
DefaultSkyRes = 'Standart.wad:STDSKY\SKY0';
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
MapReader: TMapReader_1;
Header: TMapHeaderRec_1;
_textures: TTexturesRec1Array;
MapReader: TMapReader_1;
Header: TMapHeaderRec_1;
_textures: TTexturesRec1Array;
e_WriteLog('Loading map WAD: ' + FileName, MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False);
e_WriteLog('Loading map WAD: ' + FileName, MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False);
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
if not WAD.ReadFile(FileName) then
begin
g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName]));
if not WAD.ReadFile(FileName) then
begin
g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName]));
function g_Map_GetMapInfo(Res: String): TMapInfo;
var
function g_Map_GetMapInfo(Res: String): TMapInfo;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
MapReader: TMapReader_1;
Header: TMapHeaderRec_1;
FileName, SectionName, ResName: String;
MapReader: TMapReader_1;
Header: TMapHeaderRec_1;
FileName, SectionName, ResName: String;
FillChar(Result, SizeOf(Result), 0);
g_ProcessResourceStr(Res, FileName, SectionName, ResName);
FillChar(Result, SizeOf(Result), 0);
g_ProcessResourceStr(Res, FileName, SectionName, ResName);
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
if not WAD.ReadFile(FileName) then
begin
WAD.Free();
if not WAD.ReadFile(FileName) then
begin
WAD.Free();
function g_Map_GetMapsList(WADName: string): SArray;
var
function g_Map_GetMapsList(WADName: string): SArray;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
a: Integer;
ResList: SArray;
Data: Pointer;
a: Integer;
ResList: SArray;
Data: Pointer;
begin
Result := nil;
begin
Result := nil;
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
if not WAD.ReadFile(WADName) then
begin
WAD.Free();
if not WAD.ReadFile(WADName) then
begin
WAD.Free();
function g_Map_Exist(Res: string): Boolean;
var
function g_Map_Exist(Res: string): Boolean;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
FileName, SectionName, ResName: string;
ResList: SArray;
a: Integer;
FileName, SectionName, ResName: string;
ResList: SArray;
a: Integer;
FileName := addWadExtension(FileName);
FileName := addWadExtension(FileName);
- WAD := TWADEditor_1.Create;
+ WAD := TWADFile.Create;
if not WAD.ReadFile(FileName) then
begin
WAD.Free();
if not WAD.ReadFile(FileName) then
begin
WAD.Free();