@@ -287,39 +287,39 @@ public FreightAnimations(FreightAnimations copyFACollection, MSTSWagon wagon)
287287// Load(Wagon, LoadDataList);
288288 }
289289
290- public void Load ( MSTSWagon wagon , string loadFilePath , LoadPosition loadPosition )
290+ public void Load ( string loadFilePath , LoadPosition loadPosition )
291291 {
292292 if ( GeneralIntakePoint . Type == MSTSWagon . PickupType . Container )
293293 {
294294 Container container ;
295- container = new Container ( wagon , loadFilePath ) ;
295+ container = new Container ( Wagon , loadFilePath ) ;
296296 if ( ContainerManager . LoadedContainers . ContainsKey ( loadFilePath ) )
297297 {
298298 container . Copy ( ContainerManager . LoadedContainers [ loadFilePath ] ) ;
299299 }
300300 else
301301 {
302- container . LoadFromContainerFile ( loadFilePath , wagon . Simulator . BasePath + @"\trains\trainset\" ) ;
302+ container . LoadFromContainerFile ( loadFilePath , Wagon . Simulator . BasePath + @"\trains\trainset\" ) ;
303303 ContainerManager . LoadedContainers . Add ( loadFilePath , container ) ;
304304 }
305305 Vector3 offset = new Vector3 ( 0 , 0 , 0 ) ;
306- var validity = Validity ( wagon , container , loadPosition , Offset , LoadingAreaLength , out offset ) ;
306+ var validity = Validity ( Wagon , container , loadPosition , Offset , LoadingAreaLength , out offset ) ;
307307 if ( validity )
308308 {
309309 var freightAnimDiscrete = new FreightAnimationDiscrete ( this , container , loadPosition , offset ) ;
310310 Animations . Add ( freightAnimDiscrete ) ;
311311 container . ComputeWorldPosition ( freightAnimDiscrete ) ;
312- wagon . Simulator . ContainerManager . Containers . Add ( container ) ;
312+ Wagon . Simulator . ContainerManager . Containers . Add ( container ) ;
313313 UpdateEmptyFreightAnims ( container . LengthM ) ;
314314 }
315315 else
316- Trace . TraceWarning ( $ "Container { container . ShapeFileName } could not be allocated on wagon { wagon . WagFilePath } with ID { wagon . CarID } ") ;
316+ Trace . TraceWarning ( $ "Container { container . ShapeFileName } could not be allocated on wagon { Wagon . WagFilePath } with ID { Wagon . CarID } ") ;
317317 }
318318 else
319319 Trace . TraceWarning ( "No match between wagon and load" ) ;
320320 }
321321
322- public void Load ( MSTSWagon wagon , List < LoadData > loadDataList , bool listInWagFile = false )
322+ public void Load ( List < LoadData > loadDataList , bool listInWagFile = false )
323323 {
324324 if ( GeneralIntakePoint == null )
325325 return ;
@@ -332,20 +332,20 @@ public void Load(MSTSWagon wagon, List<LoadData> loadDataList, bool listInWagFil
332332 break ;
333333 }
334334 }
335- if ( ! ( listInWagFile && wagon . Train . TrainType == Physics . Train . TRAINTYPE . REMOTE ) )
335+ if ( ! ( listInWagFile && Wagon . Train . TrainType == Physics . Train . TRAINTYPE . REMOTE ) )
336336 {
337337 if ( loadDataList != null && loadDataList . Count != 0 )
338338 {
339339 foreach ( var loadData in loadDataList )
340340 {
341- string loadDataFolder = wagon . Simulator . BasePath + @"\trains\trainset\" + loadData . Folder ;
341+ string loadDataFolder = Wagon . Simulator . BasePath + @"\trains\trainset\" + loadData . Folder ;
342342 string loadFilePath = loadDataFolder + @"\" + loadData . Name + ".load-or" ;
343343 if ( ! File . Exists ( loadFilePath ) )
344344 {
345345 Trace . TraceWarning ( $ "Ignored missing load { loadFilePath } ") ;
346346 continue ;
347347 }
348- Load ( wagon , loadFilePath , loadData . LoadPosition ) ;
348+ Load ( loadFilePath , loadData . LoadPosition ) ;
349349 }
350350 }
351351 }
@@ -364,7 +364,7 @@ public void Load(MSTSWagon wagon, List<LoadData> loadDataList, bool listInWagFil
364364 EmptyAnimations . Add ( new FreightAnimationDiscrete ( this , LoadPosition . Center ) ) ;
365365 EmptyAbove ( ) ;
366366 if ( ! listInWagFile )
367- wagon . UpdateLoadPhysics ( ) ;
367+ Wagon . UpdateLoadPhysics ( ) ;
368368 }
369369
370370 public void EmptyAbove ( )
@@ -896,7 +896,7 @@ public void RemoveLoads()
896896 /// Hides discrete freight animations and containers when remote train quits
897897 /// </summary>
898898
899- public void HideDiscreteFreightAnimations ( MSTSWagon wagon )
899+ public void HideDiscreteFreightAnimations ( )
900900 {
901901 foreach ( var animation in Animations )
902902 {
@@ -912,7 +912,7 @@ public void HideDiscreteFreightAnimations(MSTSWagon wagon)
912912 /// Shows discrete freight animations and containers when remote train quits
913913 /// </summary>
914914
915- public void ShowDiscreteFreightAnimations ( MSTSWagon wagon )
915+ public void ShowDiscreteFreightAnimations ( )
916916 {
917917 foreach ( var animation in Animations )
918918 {
@@ -924,12 +924,12 @@ public void ShowDiscreteFreightAnimations(MSTSWagon wagon)
924924
925925 }
926926
927- public string FADiscretesString ( MSTSWagon wagon )
927+ public string FADiscretesString ( )
928928 {
929929 var discretesCount = 0 ;
930930 var discretesDataString = "" ;
931931
932- foreach ( var animation in wagon . FreightAnimations . Animations )
932+ foreach ( var animation in Wagon . FreightAnimations . Animations )
933933 {
934934 if ( animation is FreightAnimationDiscrete discreteAnimation )
935935 {
0 commit comments