X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Fg_textures.pas;h=5d591577a4854b6697a6c965990363757f6860d0;hb=4cd27745126226e5e57a02f4c2a44ccbab16bbac;hp=7c130136b8a53f6a035b92cfac6dcdba877465d8;hpb=c3be56f2a3849cd22be39ce594498c7990e05606;p=d2df-editor.git diff --git a/src/editor/g_textures.pas b/src/editor/g_textures.pas index 7c13013..5d59157 100644 --- a/src/editor/g_textures.pas +++ b/src/editor/g_textures.pas @@ -1,10 +1,10 @@ unit g_textures; -{$MODE Delphi} +{$INCLUDE ../shared/a_modes.inc} interface -uses LCLIntf, LCLType, LMessages, e_graphics; +uses LCLIntf, LCLType, LMessages, e_graphics, utils; function g_SimpleCreateTextureWAD(var ID: DWORD; Resource: string): Boolean; function g_SimpleCreateTextureWADSize(var ID: DWORD; Resource: string; @@ -80,7 +80,7 @@ begin WAD := TWADEditor_1.Create; WAD.ReadFile(FileName); - if WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then + if WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), TextureData, ResourceLength) then begin if e_CreateTextureMem(TextureData, ResourceLength, ID) then Result := True; FreeMem(TextureData); @@ -137,7 +137,7 @@ begin WAD := TWADEditor_1.Create; WAD.ReadFile(FileName); - if WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then + if WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), TextureData, ResourceLength) then begin Result := e_CreateTextureMem(TextureData, ResourceLength, TexturesArray[find_id].ID); FreeMem(TextureData); @@ -158,8 +158,7 @@ begin WAD.Destroy; end; -function g_SimpleCreateTextureWADSize(var ID: DWORD; Resource: string; - X, Y, Width, Height: Word): Boolean; +function g_SimpleCreateTextureWADSize(var ID: DWORD; Resource: string; X, Y, Width, Height: Word): Boolean; var WAD: TWADEditor_1; FileName, @@ -174,7 +173,7 @@ begin WAD := TWADEditor_1.Create; WAD.ReadFile(FileName); - if WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then + if WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), TextureData, ResourceLength) then begin if e_CreateTextureMemEx(TextureData, ResourceLength, ID, X, Y, Width, Height) then Result := True; FreeMem(TextureData); @@ -205,7 +204,7 @@ begin WAD := TWADEditor_1.Create; WAD.ReadFile(FileName); - if WAD.GetResource(SectionName, ResourceName, TextureData, ResourceLength) then + if WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), TextureData, ResourceLength) then begin Result := e_CreateTextureMemEx(TextureData, ResourceLength, TexturesArray[find_id].ID, X, Y, Width, Height); FreeMem(TextureData);