1010#endregion
1111
1212using System . Collections . Generic ;
13+ using System . Globalization ;
1314using System . IO ;
1415using System . Linq ;
1516using OpenRA . Graphics ;
@@ -63,14 +64,15 @@ public class RemasterSpriteSequenceLoader : ClassicTilesetSpecificSpriteSequence
6364 public RemasterSpriteSequenceLoader ( ModData modData )
6465 : base ( modData ) { }
6566
66- public override ISpriteSequence CreateSequence ( ModData modData , string tileset , SpriteCache cache , string image , string sequence , MiniYaml data , MiniYaml defaults )
67+ public override ISpriteSequence CreateSequence ( ModData modData , string tileset , SpriteCache cache ,
68+ string image , string sequence , MiniYaml data , MiniYaml defaults )
6769 {
6870 return new RemasterSpriteSequence ( cache , this , image , sequence , data , defaults ) ;
6971 }
7072 }
7173
7274 [ Desc ( "A sprite sequence that can have tileset-specific variants and has the oddities " +
73- "that come with first-generation Westwood titles." ) ]
75+ "that come with first-generation Westwood titles." ) ]
7476 public class RemasterSpriteSequence : ClassicTilesetSpecificSpriteSequence
7577 {
7678 [ Desc ( "File name of the remastered sprite to use for this sequence." ) ]
@@ -112,7 +114,9 @@ IEnumerable<ReservationInfo> ParseRemasterFilenames(ModData modData, string tile
112114 {
113115 string filename = null ;
114116 MiniYamlNode . SourceLocation location = default ;
115- var remasteredTilesetFilenamesPatternNode = data . Nodes . FirstOrDefault ( n => n . Key == RemasteredTilesetFilenamesPattern . Key ) ?? defaults . Nodes . FirstOrDefault ( n => n . Key == RemasteredTilesetFilenamesPattern . Key ) ;
117+ var remasteredTilesetFilenamesPatternNode = data . Nodes . FirstOrDefault ( n => n . Key == RemasteredTilesetFilenamesPattern . Key )
118+ ?? defaults . Nodes . FirstOrDefault ( n => n . Key == RemasteredTilesetFilenamesPattern . Key ) ;
119+
116120 if ( remasteredTilesetFilenamesPatternNode != null )
117121 {
118122 var tilesetNode = remasteredTilesetFilenamesPatternNode . Value . Nodes . FirstOrDefault ( n => n . Key == tileset ) ;
@@ -122,11 +126,13 @@ IEnumerable<ReservationInfo> ParseRemasterFilenames(ModData modData, string tile
122126 var patternCount = LoadField ( "Count" , 1 , tilesetNode . Value ) ;
123127
124128 return Enumerable . Range ( patternStart , patternCount ) . Select ( i =>
125- new ReservationInfo ( string . Format ( tilesetNode . Value . Value , i ) , FirstFrame , FirstFrame , tilesetNode . Location ) ) ;
129+ new ReservationInfo ( string . Format ( CultureInfo . InvariantCulture , tilesetNode . Value . Value , i ) , FirstFrame , FirstFrame , tilesetNode . Location ) ) ;
126130 }
127131 }
128132
129- var remasteredTilesetFilenamesNode = data . Nodes . FirstOrDefault ( n => n . Key == RemasteredTilesetFilenames . Key ) ?? defaults . Nodes . FirstOrDefault ( n => n . Key == RemasteredTilesetFilenames . Key ) ;
133+ var remasteredTilesetFilenamesNode = data . Nodes . FirstOrDefault ( n => n . Key == RemasteredTilesetFilenames . Key )
134+ ?? defaults . Nodes . FirstOrDefault ( n => n . Key == RemasteredTilesetFilenames . Key ) ;
135+
130136 if ( ! string . IsNullOrEmpty ( remasteredTilesetFilenamesNode ? . Value . Value ) )
131137 {
132138 var tilesetNode = remasteredTilesetFilenamesNode . Value . Nodes . FirstOrDefault ( n => n . Key == tileset ) ;
@@ -138,14 +144,16 @@ IEnumerable<ReservationInfo> ParseRemasterFilenames(ModData modData, string tile
138144 }
139145 else
140146 {
141- var remasteredFilenamePatternNode = data . Nodes . FirstOrDefault ( n => n . Key == RemasteredFilenamePattern . Key ) ?? defaults . Nodes . FirstOrDefault ( n => n . Key == RemasteredFilenamePattern . Key ) ;
147+ var remasteredFilenamePatternNode = data . Nodes . FirstOrDefault ( n => n . Key == RemasteredFilenamePattern . Key )
148+ ?? defaults . Nodes . FirstOrDefault ( n => n . Key == RemasteredFilenamePattern . Key ) ;
149+
142150 if ( ! string . IsNullOrEmpty ( remasteredFilenamePatternNode ? . Value . Value ) )
143151 {
144152 var patternStart = LoadField ( "Start" , 0 , remasteredFilenamePatternNode . Value ) ;
145153 var patternCount = LoadField ( "Count" , 1 , remasteredFilenamePatternNode . Value ) ;
146154
147155 return Enumerable . Range ( patternStart , patternCount ) . Select ( i =>
148- new ReservationInfo ( string . Format ( remasteredFilenamePatternNode . Value . Value , i ) ,
156+ new ReservationInfo ( string . Format ( CultureInfo . InvariantCulture , remasteredFilenamePatternNode . Value . Value , i ) ,
149157 FirstFrame , FirstFrame , remasteredFilenamePatternNode . Location ) ) ;
150158 }
151159 }
0 commit comments