index 72b65b560c814875b020eb124a2e0068d419c9c8..78cfee512125cacdde9d939961dddeca0b4184ff 100644 (file)
--- a/src/game/g_textures.pas
+++ b/src/game/g_textures.pas
implementation
uses
implementation
uses
-{$IFDEF USE_NANOGL}
- nanoGL,
-{$ELSE}
- GL,
-{$ENDIF}
+ {$INCLUDE ../nogl/noGLuses.inc}
g_game, e_log, g_basic, g_console, wadreader,
g_language, utils, xstreams;
g_game, e_log, g_basic, g_console, wadreader,
g_language, utils, xstreams;
if WAD.GetResource(g_ExtractFilePathName(Resource), TextureData, ResourceLength) then
begin
if e_CreateTextureMem(TextureData, ResourceLength, ID) then
if WAD.GetResource(g_ExtractFilePathName(Resource), TextureData, ResourceLength) then
begin
if e_CreateTextureMem(TextureData, ResourceLength, ID) then
- begin
result := true;
result := true;
- end
- else
- begin
- FreeMem(TextureData);
- end;
+ FreeMem(TextureData)
end
else
begin
end
else
begin
e_GetTextureSize(texturesArray[find_id].ID, @texturesArray[find_id].width, @texturesArray[find_id].height);
texturesArray[find_id].used := true;
texturesArray[find_id].Name := textureName;
e_GetTextureSize(texturesArray[find_id].ID, @texturesArray[find_id].width, @texturesArray[find_id].height);
texturesArray[find_id].used := true;
texturesArray[find_id].Name := textureName;
- end
- else
- begin
- FreeMem(TextureData);
end;
end;
+ FreeMem(TextureData)
end
else
begin
end
else
begin
if not CreateFramesMem(TextureData, ResourceLength, ID, Name, mWidth, mHeight, mCount, BackAnimation) then
begin
if not CreateFramesMem(TextureData, ResourceLength, ID, Name, mWidth, mHeight, mCount, BackAnimation) then
begin
+ FreeMem(TextureData);
WAD.Free();
exit;
end;
WAD.Free();
exit;
end;
+ FreeMem(TextureData);
WAD.Free();
result := true;
WAD.Free();
result := true;