Fix trailing whitespace.

Every editor these days seems to trim trailing whitespace, which makes for noisy diffs when old files are changed. So let's just trim it all once and for all. This might mess with merges, sorry Meridian, I suggest doing the same on your fork.

Author: SupSuper

.astylerc

@@ -3,7 +3,5 @@ indent=tab
 pad-oper
 pad-header
 unpad-paren
-fill-empty-lines
-add-brackets
 align-pointer=name
-mode=c
+mode=c

CHANGELOG.txt

@@ -81,7 +81,7 @@ New features:
 - Added right-click on soldier in Craft screen to show their stats.
 - Ufopaedia now shows armor damage and stat modifiers.
 - New Advanced-Option: View soldier's Psi-Strength after the appropriate research has been completed.*
-  
+
   Battlescape:
 - Inventory: Ctrl-click an item to attempt to swap it between the ground and your soldier's inventory.
 - Inventory: Added ability to define paper dolls for non-player units.
@@ -143,7 +143,7 @@ Bugfixes:
 - Palette system overhauled to prevent windows changing colours incorrectly.
 - Fixed various bugs with Unicode handling in paths and strings.
 - Fixed various UI bugs on tablets.
-  
+
   Geoscape:
 - X-Com now correctly pays their first month's rent and maintenance in advance.
 - To avoid lawsuits, sacked soldiers no longer take their armour with them.
@@ -163,7 +163,7 @@ Bugfixes:
 - Fix the council congratulating XCom on a job well done as they cancel the project.
 - Downed UFOs will use appropriate behaviour after XCom dusts off.
 - Alien mission timers fixed.
-  
+
   Battlescape:
 - Fixes to various UFOpaedia articles.
 - Loading saved games now correctly preserves the difficulty adjustments to alien stats.
@@ -551,7 +551,7 @@ New features:
 - Support for user soldier name pools.
 - Various new options (see docs).
 - Debug mode.
- 
+
 Bugfixes:
 - Two duplicating ammo bugs.
 - Wrong rocket launcher hand sprite.

bin/common/Language/en-GB.yml

@@ -308,7 +308,7 @@ en-GB:
   STR_MOUSEWHEEL_SPEED_DESC: "Adjusts the number of lines scrolled in lists with each increment of the mouse wheel."
   STR_DISABLED: "Disabled"
   STR_MAXIMIZE_INFO_SCREENS: "Maximize info screens"
-  STR_MAXIMIZE_INFO_SCREENS_DESC: "Inventory and various other screens will be displayed at full screen, regardless of scale settings."  
+  STR_MAXIMIZE_INFO_SCREENS_DESC: "Inventory and various other screens will be displayed at full screen, regardless of scale settings."
   STR_DIARY: "DIARY"
   STR_KILLED: "KILLED"
   STR_STUNNED: "STUNNED"

bin/common/Language/en-US.yml

@@ -308,7 +308,7 @@ en-US:
   STR_MOUSEWHEEL_SPEED_DESC: "Adjusts the number of lines scrolled in lists with each increment of the mouse wheel."
   STR_DISABLED: "Disabled"
   STR_MAXIMIZE_INFO_SCREENS: "Maximize info screens"
-  STR_MAXIMIZE_INFO_SCREENS_DESC: "Inventory and various other screens will be displayed at full screen, regardless of scale settings."  
+  STR_MAXIMIZE_INFO_SCREENS_DESC: "Inventory and various other screens will be displayed at full screen, regardless of scale settings."
   STR_DIARY: "DIARY"
   STR_KILLED: "KILLED"
   STR_STUNNED: "STUNNED"

bin/common/Shaders/5xBR_Rounded.OpenGL.shader

@@ -1,6 +1,6 @@
 # <!--
    # Hyllian's 5xBR v3.7a Shader
-   
+
    # Copyright (C) 2011, 2012 Hyllian/Jararaca - sergiogdb@gmail.com
    # Copyright (C) 2012 crazy46guy (GLSL conversion)
 
@@ -43,7 +43,7 @@ vertex: |
       gl_TexCoord[4] = gl_MultiTexCoord0.xxxy + vec4(    -dx,   0,  dx,      dy);  //   G  H  I
       gl_TexCoord[5] = gl_MultiTexCoord0.xxxy + vec4(    -dx,   0,  dx,  2.0*dy);  //  G5 H5 I5
       gl_TexCoord[6] = gl_MultiTexCoord0.xyyy + vec4(-2.0*dx, -dy,   0,      dy);  //  A0 D0 G0
-      gl_TexCoord[7] = gl_MultiTexCoord0.xyyy + vec4( 2.0*dx, -dy,   0,      dy);  //  C4 F4 I4 
+      gl_TexCoord[7] = gl_MultiTexCoord0.xyyy + vec4( 2.0*dx, -dy,   0,      dy);  //  C4 F4 I4
     }
 fragment: |
     uniform sampler2D rubyTexture;
@@ -73,7 +73,7 @@ fragment: |
 
     bvec4 _or_(bvec4 A, bvec4 B) {
       return bvec4(A.x || B.x, A.y || B.y, A.z || B.z, A.w || B.w);
-    } 
+    }
 
     vec4 df(vec4 A, vec4 B) {
       return vec4(abs(A - B));
@@ -139,15 +139,15 @@ fragment: |
       vec4 Cy = vec4( 2.0,  0.0, -1.0,  0.5 );
 
       // These inequations define the line below which interpolation occurs
-      bvec4 fx      = greaterThan(Ao * fp.y + Bo * fp.x, Co); 
+      bvec4 fx      = greaterThan(Ao * fp.y + Bo * fp.x, Co);
       bvec4 fx_left = greaterThan(Ax * fp.y + Bx * fp.x, Cx);
       bvec4 fx_up   = greaterThan(Ay * fp.y + By * fp.x, Cy);
 
       bvec4 interp_restriction_lv1      = _and_( notEqual(e, f), notEqual(e, h) );
       bvec4 interp_restriction_lv2_left = _and_( notEqual(e, g), notEqual(d, g) );
       bvec4 interp_restriction_lv2_up   = _and_( notEqual(e, c), notEqual(b, c) );
 
-      bvec4 edr      = _and_( lessThan(weighted_distance(e, c, g, i, h5, f4, h, f), 
+      bvec4 edr      = _and_( lessThan(weighted_distance(e, c, g, i, h5, f4, h, f),
                                        weighted_distance(h, d, i5, f, i4, b, e, i)), interp_restriction_lv1 );
       bvec4 edr_left = _and_( lessThanEqual(coef * df(f, g), df(h, c)), interp_restriction_lv2_left );
       bvec4 edr_up   = _and_( greaterThanEqual(df(f, g), coef * df(h, c)), interp_restriction_lv2_up );

bin/common/Shaders/5xBR_Semi-Rounded.OpenGL.shader

@@ -1,7 +1,7 @@
 # <?xml version="1.0" encoding="UTF-8"?>
 # <!--
     # Hyllian's 5xBR v3.7b (semi-rounded) Shader
-   
+
    # Copyright (C) 2011, 2012 Hyllian/Jararaca - sergiogdb@gmail.com
    # Copyright (C) 2012 crazy46guy (GLSL conversion)
 
@@ -44,7 +44,7 @@ vertex: |
       gl_TexCoord[4] = gl_MultiTexCoord0.xxxy + vec4(    -dx,   0,  dx,      dy);  //   G  H  I
       gl_TexCoord[5] = gl_MultiTexCoord0.xxxy + vec4(    -dx,   0,  dx,  2.0*dy);  //  G5 H5 I5
       gl_TexCoord[6] = gl_MultiTexCoord0.xyyy + vec4(-2.0*dx, -dy,   0,      dy);  //  A0 D0 G0
-      gl_TexCoord[7] = gl_MultiTexCoord0.xyyy + vec4( 2.0*dx, -dy,   0,      dy);  //  C4 F4 I4 
+      gl_TexCoord[7] = gl_MultiTexCoord0.xyyy + vec4( 2.0*dx, -dy,   0,      dy);  //  C4 F4 I4
     }
 fragment: |
     uniform sampler2D rubyTexture;
@@ -76,7 +76,7 @@ fragment: |
 
     bvec4 _or_(bvec4 A, bvec4 B) {
       return bvec4(A.x || B.x, A.y || B.y, A.z || B.z, A.w || B.w);
-    } 
+    }
 
     vec4 df(vec4 A, vec4 B) {
       return vec4(abs(A - B));
@@ -146,7 +146,7 @@ fragment: |
       vec4 Cy = vec4( 2.0,  0.0, -1.0,  0.5 );
 
       // These inequations define the line below which interpolation occurs
-      bvec4 fx      = greaterThan(Ao * fp.y + Bo * fp.x, Co); 
+      bvec4 fx      = greaterThan(Ao * fp.y + Bo * fp.x, Co);
       bvec4 fx_left = greaterThan(Ax * fp.y + Bx * fp.x, Cx);
       bvec4 fx_up   = greaterThan(Ay * fp.y + By * fp.x, Cy);
 
@@ -159,7 +159,7 @@ fragment: |
       bvec4 interp_restriction_lv2_left = _and_( notEqual(e, g), notEqual(d, g) );
       bvec4 interp_restriction_lv2_up   = _and_( notEqual(e, c), notEqual(b, c) );
 
-      bvec4 edr      = _and_( lessThan(weighted_distance(e, c, g, i, h5, f4, h, f), 
+      bvec4 edr      = _and_( lessThan(weighted_distance(e, c, g, i, h5, f4, h, f),
                                        weighted_distance(h, d, i5, f, i4, b, e, i)), interp_restriction_lv1 );
       bvec4 edr_left = _and_( lessThanEqual(coef * df(f, g), df(h, c)), interp_restriction_lv2_left );
       bvec4 edr_up   = _and_( greaterThanEqual(df(f, g), coef * df(h, c)), interp_restriction_lv2_up );

bin/common/Shaders/5xBR_Squared.OpenGL.shader

@@ -1,7 +1,7 @@
 # <?xml version="1.0" encoding="UTF-8"?>
 # <!--
     # Hyllian's 5xBR v3.7c (squared) Shader
-   
+
    # Copyright (C) 2011, 2012 Hyllian/Jararaca - sergiogdb@gmail.com
    # Copyright (C) 2012 crazy46guy (GLSL conversion)
 
@@ -44,7 +44,7 @@ vertex: |
       gl_TexCoord[4] = gl_MultiTexCoord0.xxxy + vec4(    -dx,   0,  dx,      dy);  //   G  H  I
       gl_TexCoord[5] = gl_MultiTexCoord0.xxxy + vec4(    -dx,   0,  dx,  2.0*dy);  //  G5 H5 I5
       gl_TexCoord[6] = gl_MultiTexCoord0.xyyy + vec4(-2.0*dx, -dy,   0,      dy);  //  A0 D0 G0
-      gl_TexCoord[7] = gl_MultiTexCoord0.xyyy + vec4( 2.0*dx, -dy,   0,      dy);  //  C4 F4 I4 
+      gl_TexCoord[7] = gl_MultiTexCoord0.xyyy + vec4( 2.0*dx, -dy,   0,      dy);  //  C4 F4 I4
     }
 fragment: |
     uniform sampler2D rubyTexture;
@@ -76,7 +76,7 @@ fragment: |
 
     bvec4 _or_(bvec4 A, bvec4 B) {
       return bvec4(A.x || B.x, A.y || B.y, A.z || B.z, A.w || B.w);
-    } 
+    }
 
     vec4 df(vec4 A, vec4 B) {
       return vec4(abs(A - B));
@@ -146,7 +146,7 @@ fragment: |
       vec4 Cy = vec4( 2.0,  0.0, -1.0,  0.5 );
 
       // These inequations define the line below which interpolation occurs
-      bvec4 fx      = greaterThan(Ao * fp.y + Bo * fp.x, Co); 
+      bvec4 fx      = greaterThan(Ao * fp.y + Bo * fp.x, Co);
       bvec4 fx_left = greaterThan(Ax * fp.y + Bx * fp.x, Cx);
       bvec4 fx_up   = greaterThan(Ay * fp.y + By * fp.x, Cy);
 
@@ -162,7 +162,7 @@ fragment: |
       bvec4 interp_restriction_lv2_left = _and_( notEqual(e, g), notEqual(d, g) );
       bvec4 interp_restriction_lv2_up   = _and_( notEqual(e, c), notEqual(b, c) );
 
-      bvec4 edr      = _and_( lessThan(weighted_distance(e, c, g, i, h5, f4, h, f), 
+      bvec4 edr      = _and_( lessThan(weighted_distance(e, c, g, i, h5, f4, h, f),
                                        weighted_distance(h, d, i5, f, i4, b, e, i)), interp_restriction_lv1 );
       bvec4 edr_left = _and_( lessThanEqual(coef * df(f, g), df(h, c)), interp_restriction_lv2_left );
       bvec4 edr_up   = _and_( greaterThanEqual(df(f, g), coef * df(h, c)), interp_restriction_lv2_up );

bin/common/Shaders/HQ2x.OpenGL.shader

@@ -32,15 +32,15 @@ fragment: |
   const float lum_add = 0.25;  // effects smoothing
 
   void main() {
-    vec3 c00 = texture2D(rubyTexture, gl_TexCoord[1].xy).xyz; 
-    vec3 c10 = texture2D(rubyTexture, gl_TexCoord[1].zw).xyz; 
-    vec3 c20 = texture2D(rubyTexture, gl_TexCoord[2].xy).xyz; 
-    vec3 c01 = texture2D(rubyTexture, gl_TexCoord[4].zw).xyz; 
-    vec3 c11 = texture2D(rubyTexture, gl_TexCoord[0].xy).xyz; 
-    vec3 c21 = texture2D(rubyTexture, gl_TexCoord[2].zw).xyz; 
-    vec3 c02 = texture2D(rubyTexture, gl_TexCoord[4].xy).xyz; 
-    vec3 c12 = texture2D(rubyTexture, gl_TexCoord[3].zw).xyz; 
-    vec3 c22 = texture2D(rubyTexture, gl_TexCoord[3].xy).xyz; 
+    vec3 c00 = texture2D(rubyTexture, gl_TexCoord[1].xy).xyz;
+    vec3 c10 = texture2D(rubyTexture, gl_TexCoord[1].zw).xyz;
+    vec3 c20 = texture2D(rubyTexture, gl_TexCoord[2].xy).xyz;
+    vec3 c01 = texture2D(rubyTexture, gl_TexCoord[4].zw).xyz;
+    vec3 c11 = texture2D(rubyTexture, gl_TexCoord[0].xy).xyz;
+    vec3 c21 = texture2D(rubyTexture, gl_TexCoord[2].zw).xyz;
+    vec3 c02 = texture2D(rubyTexture, gl_TexCoord[4].xy).xyz;
+    vec3 c12 = texture2D(rubyTexture, gl_TexCoord[3].zw).xyz;
+    vec3 c22 = texture2D(rubyTexture, gl_TexCoord[3].xy).xyz;
     vec3 dt = vec3(1.0, 1.0, 1.0);
 
     float md1 = dot(abs(c00 - c22), dt);

bin/common/Shaders/Openxcom.OpenGL.shader

@@ -54,17 +54,17 @@ vertex: |
                 //      br = bottom-right vertex                //
                 //      bl = bottom-left vertex                 //
                 //////////////////////////////////////////////////
-                const vec2 tr = vec2(x_value,y_value); 
+                const vec2 tr = vec2(x_value,y_value);
                 const vec2 tl = vec2(-x_value,y_value);
-                const vec2 br = vec2(x_value,0.0); 
+                const vec2 br = vec2(x_value,0.0);
                 const vec2 bl = vec2(-x_value,0.0);
 
                 ////////////////////////////////////////////////////////
                 //Defines screen position and initial texture coord's.//
                 ////////////////////////////////////////////////////////
                 gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
                 gl_TexCoord[0] = gl_MultiTexCoord0;
-                
+
                 //////////////////////////////////////////////////////
                 //Defines the x-y section of the texture coordinate.//
                 //////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ vertex: |
                 gl_TexCoord[4].xy = gl_TexCoord[0].xy + (tl * 0.55);
                 gl_TexCoord[5].xy = gl_TexCoord[0].xy - tr;
                 gl_TexCoord[6].xy = gl_TexCoord[0].xy + tr;
-                
+
                 //////////////////////////////////////////////////////
                 //Defines the z-w section of the texture coordinate.//
                 //////////////////////////////////////////////////////
@@ -110,8 +110,8 @@ fragment: |
         //        min_weight = minimum filter weight                //
         //////////////////////////////////////////////////////////////
         const float start_weight =  1.04;
-        const float k            = -1.07;      
-        const float max_weight   =  0.73;   
+        const float k            = -1.07;
+        const float max_weight   =  0.73;
         const float min_weight   =  0.05;
 
         ////////////////////////////////////////////////////////////////////
@@ -142,10 +142,10 @@ fragment: |
               //FILTER WEIGHTS: These are the weights which will be used//
               //by the filter to produce the intended result.           //
               ////////////////////////////////////////////////////////////
-              float w1 = min(dot(abs(i2-i4),ref), max(dp(o2),dp(o4))); 
-              float w2 = min(dot(abs(i1-i3),ref), max(dp(o1),dp(o3))); 
-              float w3 = min(dot(abs(i2-i4),ref), max(dp(o2),dp(o4))); 
-              float w4 = min(dot(abs(i1-i3),ref), max(dp(o1),dp(o3))); 
+              float w1 = min(dot(abs(i2-i4),ref), max(dp(o2),dp(o4)));
+              float w2 = min(dot(abs(i1-i3),ref), max(dp(o1),dp(o3)));
+              float w3 = min(dot(abs(i2-i4),ref), max(dp(o2),dp(o4)));
+              float w4 = min(dot(abs(i1-i3),ref), max(dp(o1),dp(o3)));
 
               //////////////////////////////////////////////////////////////////
               //Adjusts the weight values, based on the previous dot-products.//
@@ -173,9 +173,9 @@ fragment: |
               //Weights w1 to w4 are clamped between the min and the max weight,//
               //preventing them from aversely being too high or too low.        //
               ////////////////////////////////////////////////////////////////////
-              w1 = clamp(w1+start_weight, min_weight, max_weight); 
+              w1 = clamp(w1+start_weight, min_weight, max_weight);
               w2 = clamp(w2+start_weight, min_weight, max_weight);
-              w3 = clamp(w3+start_weight, min_weight, max_weight); 
+              w3 = clamp(w3+start_weight, min_weight, max_weight);
               w4 = clamp(w4+start_weight, min_weight, max_weight);
 
               ///////////////////////////////////////////////////////////////////////////