CRLF fixes, .gitattributes file updated

[xonotic/xonotic.git] / misc / tools / shadescript / shade.vbs

diff --git a/misc/tools/shadescript/shade.vbs b/misc/tools/shadescript/shade.vbs
index e5dc4bed243ec93371c6aa759db6dab6761ec90c..6721aa6ed5ae94c27c7b57054092fb311e712999 100644 (file)
--- a/misc/tools/shadescript/shade.vbs
+++ b/misc/tools/shadescript/shade.vbs
@@ -1,28 +1,28 @@
 option explicit 
 
 
 option explicit 
 
 

-Const ForReading = 1\r
-Const ForWriting = 2\r
-Const ForAppending = 8\r
+Const ForReading = 1
+Const ForWriting = 2
+Const ForAppending = 8

 
 dim CRLF 
 
 
 dim CRLF 
 

-CRLF = Chr(13) & Chr(10)\r
+CRLF = Chr(13) & Chr(10)

 
 

-dim scriptFullName, scriptPath \r
-scriptFullName = WScript.ScriptFullName\r
+dim scriptFullName, scriptPath 
+scriptFullName = WScript.ScriptFullName

 scriptPath = Left ( scriptFullName, InStrRev ( scriptFullName, WScript.ScriptName) - 1 )
 scriptPath = Left ( scriptFullName, InStrRev ( scriptFullName, WScript.ScriptName) - 1 )

-\r
+

 dim objFSO, setfolder, re, shader, objShaderTemplate, shaderTemplate
 dim objFSO, setfolder, re, shader, objShaderTemplate, shaderTemplate

-Set objFSO = CreateObject("Scripting.FileSystemObject")\r
-Set setfolder = objFSO.GetFolder(scriptPath)\r
+Set objFSO = CreateObject("Scripting.FileSystemObject")
+Set setfolder = objFSO.GetFolder(scriptPath)

 Set re = New RegExp
 
 re.IgnoreCase = True
 re.Global = True
 Set re = New RegExp
 
 re.IgnoreCase = True
 re.Global = True

-re.Pattern = ""\r
-\r
-Set shader = objFSO.OpenTextFile (scriptPath & "\" & setfolder.name & ".shader", ForWriting, True)\r
+re.Pattern = ""
+
+Set shader = objFSO.OpenTextFile (scriptPath & "\" & setfolder.name & ".shader", ForWriting, True)

 
 Set objShaderTemplate = objFSO.OpenTextFile(scriptPath & "\template.shader", ForReading)
 shaderTemplate = objShaderTemplate.ReadAll()
 
 Set objShaderTemplate = objFSO.OpenTextFile(scriptPath & "\template.shader", ForReading)
 shaderTemplate = objShaderTemplate.ReadAll()


@@ -30,13 +30,13 @@ shaderTemplate = objShaderTemplate.ReadAll()
 function filetitle(sfilename)
        filetitle = Left(sfilename, len(sfilename) - 4)
 end function 
 function filetitle(sfilename)
        filetitle = Left(sfilename, len(sfilename) - 4)
 end function 

-\r
+

 dim noLightmap, isLiquid, isTransparent, bounceScale, shaderString
 dim shaderHead, shaderTail, shaderQUI, shaderDiffuse, diffuseExtra
 dim subfold, texfile, fn
 
 dim noLightmap, isLiquid, isTransparent, bounceScale, shaderString
 dim shaderHead, shaderTail, shaderQUI, shaderDiffuse, diffuseExtra
 dim subfold, texfile, fn
 

-For Each subfold in setfolder.Subfolders\r
-       ' shader.write "Folder: " & subfold.Name & CRLF\r
+For Each subfold in setfolder.Subfolders
+       ' shader.write "Folder: " & subfold.Name & CRLF

        For Each texfile In subfold.Files
                'Defaults               
                noLightmap              = false
        For Each texfile In subfold.Files
                'Defaults               
                noLightmap              = false


@@ -53,7 +53,7 @@ For Each subfold in setfolder.Subfolders
                
                ' First ignore any extra map or Thumbs.db
                re.Pattern = "_bump.|_gloss.|_norm.|_glow.|Thumbs.db"
                
                ' First ignore any extra map or Thumbs.db
                re.Pattern = "_bump.|_gloss.|_norm.|_glow.|Thumbs.db"

-               if not re.test(texfile.name) then                       \r
+               if not re.test(texfile.name) then                       

                        re.pattern = "decal"
                        if re.test(texfile.name) then
                                noLightmap = true
                        re.pattern = "decal"
                        if re.test(texfile.name) then
                                noLightmap = true


@@ -163,10 +163,10 @@ For Each subfold in setfolder.Subfolders
 
                        
                        shader.write shaderString & CRLF & CRLF
 
                        
                        shader.write shaderString & CRLF & CRLF

-               end if\r
-       Next\r
-Next\r
-shader.Close\r
-\r
-\r
-\r
+               end if
+       Next
+Next
+shader.Close
+
+
+