X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fshared%2Fwadreader.pas;h=df0de0fc591a48ffe3d16ce7f68ba412fd781b85;hb=dd0d8ac4cc2a0aa774f25c8a1a774f7358acfae7;hp=2997bce0abac0b94b78c6a49f96b45dca027c65e;hpb=9e08e52b1845570063f7491ac5eda3e9470a01c9;p=d2df-sdl.git

diff --git a/src/shared/wadreader.pas b/src/shared/wadreader.pas
index 2997bce..df0de0f 100644
--- a/src/shared/wadreader.pas
+++ b/src/shared/wadreader.pas
@@ -13,10 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE a_modes.inc}
 unit wadreader;
 
-{$DEFINE SFS_DWFAD_DEBUG}
+{$DEFINE SFS_DFWAD_DEBUG}
 {$DEFINE SFS_MAPDETECT_FX}
 
 interface
@@ -387,7 +387,7 @@ begin
       end;
 {$ENDIF}
       result := true;
-      {$IFDEF SFS_DWFAD_DEBUG}
+      {$IFDEF SFS_DFWAD_DEBUG}
       if wadoptDebug then
         e_WriteLog(Format('DFWAD: file [%s] FOUND in [%s]; size is %d bytes', [name, fFileName, Len]), MSG_NOTIFY);
       {$ENDIF}
@@ -455,7 +455,7 @@ begin
     e_WriteLog(Format('TWADFile.ReadFile: error looking for [%s]', [FileName]), MSG_NOTIFY);
     exit;
   end;
-  {$IFDEF SFS_DWFAD_DEBUG}
+  {$IFDEF SFS_DFWAD_DEBUG}
   if wadoptDebug then e_WriteLog(Format('TWADFile.ReadFile: FOUND [%s]', [rfn]), MSG_NOTIFY);
   {$ENDIF}
   // cache this wad
@@ -474,7 +474,7 @@ begin
   fIter := SFSFileList(rfn);
   if fIter = nil then Exit;
   fFileName := rfn;
-  {$IFDEF SFS_DWFAD_DEBUG}
+  {$IFDEF SFS_DFWAD_DEBUG}
   if wadoptDebug then e_WriteLog(Format('TWADFile.ReadFile: [%s] opened', [fFileName]), MSG_NOTIFY);
   {$ENDIF}
   Result := True;
@@ -501,8 +501,8 @@ begin
 
   fn := Format(' -- memwad %d -- ', [uniqueCounter]);
   Inc(uniqueCounter);
-  {$IFDEF SFS_DWFAD_DEBUG}
-    e_WriteLog(Format('TWADFile.ReadMemory: [%s]', [fn]), MSG_NOTIFY);
+  {$IFDEF SFS_DFWAD_DEBUG}
+  if wadoptDebug then e_WriteLog(Format('TWADFile.ReadMemory: [%s]', [fn]), MSG_NOTIFY);
   {$ENDIF}
 
   try
@@ -521,8 +521,8 @@ begin
   if fIter = nil then Exit;
 
   fFileName := fn;
-  {$IFDEF SFS_DWFAD_DEBUG}
-    e_WriteLog(Format('TWADFile.ReadMemory: [%s] opened', [fFileName]), MSG_NOTIFY);
+  {$IFDEF SFS_DFWAD_DEBUG}
+  if wadoptDebug then e_WriteLog(Format('TWADFile.ReadMemory: [%s] opened', [fFileName]), MSG_NOTIFY);
   {$ENDIF}
 
   {