X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_texture.pas;h=e4ffca316d70101e641265c4ac13eeb2f9a9f228;hb=92c7868df227201d6914f9f07c9a29ba0e2863cb;hp=4db41dc091005e56b554d52f581c6fc822130758;hpb=94a927ca673a2d8af4b8449d434f3c70f38b11c1;p=d2df-sdl.git

diff --git a/src/engine/e_texture.pas b/src/engine/e_texture.pas
index 4db41dc..e4ffca3 100644
--- a/src/engine/e_texture.pas
+++ b/src/engine/e_texture.pas
@@ -1,4 +1,4 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* Copyright (C)  Doom 2D: Forever Developers
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@ unit e_texture;
 interface
 
 uses
-  GL, GLExt, SysUtils, e_log,
-  ImagingTypes, Imaging, ImagingUtility;
+  {$INCLUDE ../nogl/noGLuses.inc}
+  SysUtils, e_log, ImagingTypes, Imaging, ImagingUtility;
 
 type
   GLTexture = record
@@ -108,7 +108,7 @@ begin
   glBindTexture(GL_TEXTURE_2D, Texture);
 
   if (tex.glwidth <> tex.width) or (tex.glheight <> tex.height) then
-    e_WriteLog(Format('NPOT: %u is %ux%u; gl is %ux%u; u=%f; v=%f', [tex.id, Width, Height, tex.glwidth, tex.glheight, tex.u, tex.v]), MSG_NOTIFY);
+    e_WriteLog(Format('NPOT: %u is %ux%u; gl is %ux%u; u=%f; v=%f', [tex.id, Width, Height, tex.glwidth, tex.glheight, tex.u, tex.v]), TMsgType.Notify);
 
   // texture blends with object background
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -185,7 +185,7 @@ begin
 
   if (img.width < 1) or (img.width > 32768) or (img.height < 1) or (img.height > 32768) then
   begin
-    e_WriteLog('Error loading texture: invalid image dimensions', MSG_WARNING);
+    e_WriteLog('Error loading texture: invalid image dimensions', TMsgType.Warning);
     exit;
   end;
   //ConvertImage(img, ifA8R8G8B8);
@@ -234,7 +234,7 @@ begin
   InitImage(img);
   if not LoadImageFromMemory(pData, dataSize, img) then
   begin
-    e_WriteLog('Error loading texture: unknown image format', MSG_WARNING);
+    e_WriteLog('Error loading texture: unknown image format', TMsgType.Warning);
     exit;
   end;
   try
@@ -260,13 +260,13 @@ begin
   InitImage(img);
   if not LoadImageFromMemory(pData, dataSize, img) then
   begin
-    e_WriteLog('Error loading texture: unknown image format', MSG_WARNING);
+    e_WriteLog('Error loading texture: unknown image format', TMsgType.Warning);
     exit;
   end;
   try
     if (img.width < 1) or (img.width > 32768) or (img.height < 1) or (img.height > 32768) then
     begin
-      e_WriteLog('Error loading texture: invalid image dimensions', MSG_WARNING);
+      e_WriteLog('Error loading texture: invalid image dimensions', TMsgType.Warning);
       exit;
     end;
     //ConvertImage(img, ifA8R8G8B8);
@@ -321,7 +321,7 @@ begin
   end;
   if fs = nil then
   begin
-    e_WriteLog('Texture "'+filename+'" not found', MSG_WARNING);
+    e_WriteLog('Texture "'+filename+'" not found', TMsgType.Warning);
     exit;
   end;
 
@@ -357,7 +357,7 @@ begin
   end;
   if fs = nil then
   begin
-    e_WriteLog('Texture "'+filename+'" not found', MSG_WARNING);
+    e_WriteLog('Texture "'+filename+'" not found', TMsgType.Warning);
     exit;
   end;