From a00122fe60de966751b637477ac8e0a4fdcfbf4b Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 20 Dec 2007 23:59:59 +0000 Subject: removed a bunch of debugging from usdx startup. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@738 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UFiles.pas | 4 ---- Game/Code/Classes/UIni.pas | 2 -- Game/Code/Classes/ULog.pas | 34 ++++++++++++++++------------------ Game/Code/Classes/UTexture.pas | 2 +- Game/Code/Menu/UMenu.pas | 15 --------------- 5 files changed, 17 insertions(+), 40 deletions(-) diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas index e4f83b7a..274bf404 100644 --- a/Game/Code/Classes/UFiles.pas +++ b/Game/Code/Classes/UFiles.pas @@ -128,8 +128,6 @@ begin Identifier := Uppercase(Trim(Copy(Line, 2, Temp - 2))); //Uppercase is for Case Insensitive Checks Value := Trim(Copy(Line, Temp + 1,Length(Line) - Temp)); - Log.LogError('Identifier: '+Identifier+' - '+ Value ); - //Check the Identifier (If Value is given) if (Length(Value) <> 0) then begin @@ -332,8 +330,6 @@ Result := False; //Reset LineNo FileLineNo := 0; - writeln( 'Assign File : ' + Song.Path + Song.FileName ); - //Open File and set File Pointer to the beginning AssignFile(SongFile, Song.Path + Song.FileName); diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas index 0e84c506..abbef723 100644 --- a/Game/Code/Classes/UIni.pas +++ b/Game/Code/Classes/UIni.pas @@ -415,10 +415,8 @@ begin //Search for Skins for this Theme for Pet := low(Skin.Skin) to high(Skin.Skin) do begin - writeln( 'forloop' ); if UpperCase(Skin.Skin[Pet].Theme) = Tekst then begin - writeln( 'match' ); SetLength(ITheme, Length(ITheme)+1); ITheme[High(ITheme)] := GetFileName(SR.Name); break; diff --git a/Game/Code/Classes/ULog.pas b/Game/Code/Classes/ULog.pas index 50e9bf68..01eff5f4 100644 --- a/Game/Code/Classes/ULog.pas +++ b/Game/Code/Classes/ULog.pas @@ -189,8 +189,6 @@ begin FileErrorO := false; end; end; - {$DEFINE DEBUG} //How can i check if this is set in *.dpr file o0 - //If Debug => Write to Console Output {$IFDEF DEBUG} WriteLn('Error: ' + Text); {$ENDIF} @@ -230,7 +228,7 @@ begin //If Debug => Write to Console Output {$IFDEF DEBUG} - WriteLn(Log2 + ': ' + Log1); +// WriteLn(Log2 + ': ' + Log1); {$ENDIF} end; @@ -260,21 +258,21 @@ end; procedure TLog.LogBuffer(const buf: Pointer; const bufLength: Integer; filename: string); var f : TFileStream; -begin - f := nil; - - try - f := TFileStream.Create( filename, fmCreate); - f.Write( buf^, bufLength); - f.Free; - except - on e : Exception do begin - Log.LogError('TLog.LogBuffer: Failed to log buffer into file "' + filename + '". ErrMsg: ' + e.Message); - f.Free; - end; - end; -end; - +begin + f := nil; + + try + f := TFileStream.Create( filename, fmCreate); + f.Write( buf^, bufLength); + f.Free; + except + on e : Exception do begin + Log.LogError('TLog.LogBuffer: Failed to log buffer into file "' + filename + '". ErrMsg: ' + e.Message); + f.Free; + end; + end; +end; + end. diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas index 8701673e..f57c9c15 100644 --- a/Game/Code/Classes/UTexture.pas +++ b/Game/Code/Classes/UTexture.pas @@ -1,6 +1,6 @@ unit UTexture; // added for easier debug disabling -{$define blindydebug} +{$undefine blindydebug} // Plain (alpha = 1) // Transparent diff --git a/Game/Code/Menu/UMenu.pas b/Game/Code/Menu/UMenu.pas index 99f10c08..e6bb6b45 100644 --- a/Game/Code/Menu/UMenu.pas +++ b/Game/Code/Menu/UMenu.pas @@ -277,10 +277,6 @@ begin //Button Collections are Created when the first ChildButton is Created PrepareButtonCollections(ThemeBasic.ButtonCollection); - {$ifdef fpc} - writeln(' TMenu.LoadFromThem : '+ThemeBasic.Background.Tex ); - {$endif} - //Add Background AddBackground(ThemeBasic.Background.Tex); @@ -298,24 +294,13 @@ var begin if Name <> '' then begin -// BackImg := Texture.LoadTexture(false, PChar(Skin.SkinPath + FileName), 'JPG', 'Plain', 0); // new theme system lFileName := Skin.GetTextureFileName(Name); lFileName := AdaptFilePaths( lFileName ); - {$ifdef fpc} - writeln(' TMenu.AddBackground : '+Name+ ' - '+ lFileName ); - {$endif} - -// if lFileName <> '' then if fileexists( lFileName ) then begin BackImg := Texture.GetTexture( lFileName , 'Plain'); - {$ifdef fpc} - writeln(' TMenu.AddBackground : '+ lFileName +' - LOADED'); - {$endif} - - BackImg.W := 800; BackImg.H := 600; BackW := 1; -- cgit v1.2.3