Skip to content

Commit 237904d

Browse files
CsantucciCsantucci
committed
Remove redundant method call parameter
1 parent bf98bf7 commit 237904d

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

‎Source/Orts.Simulation/MultiPlayer/MPManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ private void RemovePlayer()
653653
car.IsPartOfActiveTrain = false; // to stop sounds
654654
// remove containers if any
655655
if (car.FreightAnimations?.Animations != null)
656-
car.FreightAnimations?.HideDiscreteFreightAnimations(car as MSTSWagon);
656+
car.FreightAnimations?.HideDiscreteFreightAnimations();
657657
}
658658
}
659659
p.Train.RemoveFromTrack();

‎Source/Orts.Simulation/MultiPlayer/Message.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ public MSGPlayer(string n, string cd, string c, string p, Train t, int tn, strin
428428
lengths[i] = (int)(t.Cars[i].CarLengthM * 100);
429429
fadiscretes[i] = "0";
430430
if (t.Cars[i].FreightAnimations != null)
431-
fadiscretes[i] = t.Cars[i].FreightAnimations.FADiscretesString((MSTSWagon)t.Cars[i]);
431+
fadiscretes[i] = t.Cars[i].FreightAnimations.FADiscretesString();
432432
}
433433
if (t.LeadLocomotive != null) leadingID = t.LeadLocomotive.CarID;
434434
else leadingID = "NA";
@@ -739,7 +739,7 @@ private void InsertTrainReference(Train train)
739739
{
740740
car.Train = train;
741741
car.IsPartOfActiveTrain = true;
742-
car.FreightAnimations?.ShowDiscreteFreightAnimations(car as MSTSWagon);
742+
car.FreightAnimations?.ShowDiscreteFreightAnimations();
743743
}
744744
}
745745

@@ -1323,7 +1323,7 @@ public MSGTrain(Train t, int n)
13231323
else flipped[i] = 0;
13241324
fadiscretes[i] = "0";
13251325
if (t.Cars[i].FreightAnimations != null)
1326-
fadiscretes[i] = t.Cars[i].FreightAnimations.FADiscretesString((MSTSWagon)t.Cars[i]);
1326+
fadiscretes[i] = t.Cars[i].FreightAnimations.FADiscretesString();
13271327
}
13281328
TrainNum = n;
13291329
direction = t.RearTDBTraveller.Direction == Traveller.TravellerDirection.Forward ? 1 : 0;
@@ -1378,7 +1378,7 @@ public override void HandleMsg() //only client will get message, thus will set s
13781378
Enum.TryParse(loadDataItems[2], out loadData.LoadPosition);
13791379
loadDataList.Add(loadData);
13801380
}
1381-
car.FreightAnimations?.Load(car as MSTSWagon, loadDataList);
1381+
car.FreightAnimations?.Load(loadDataList);
13821382
}
13831383
}
13841384
catch (Exception error)
@@ -1540,7 +1540,7 @@ public MSGUpdateTrain(string u, Train t, int n)
15401540
else flipped[i] = 0;
15411541
fadiscretes[i] = "0";
15421542
if (t.Cars[i].FreightAnimations != null)
1543-
fadiscretes[i] = t.Cars[i].FreightAnimations.FADiscretesString((MSTSWagon)t.Cars[i]);
1543+
fadiscretes[i] = t.Cars[i].FreightAnimations.FADiscretesString();
15441544
}
15451545
TrainNum = n;
15461546
direction = t.RearTDBTraveller.Direction == Traveller.TravellerDirection.Forward ? 1 : 0;
@@ -1607,7 +1607,7 @@ public override void HandleMsg() //only client will get message, thus will set s
16071607
Enum.TryParse(loadDataItems[2], out loadData.LoadPosition);
16081608
loadDataList.Add(loadData);
16091609
}
1610-
car.FreightAnimations?.Load(car as MSTSWagon, loadDataList);
1610+
car.FreightAnimations?.Load(loadDataList);
16111611
}
16121612
}
16131613
catch (Exception error)

‎Source/Orts.Simulation/MultiPlayer/OnlineTrains.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public void AddPlayers(MSGPlayer player, OnlinePlayer p)
211211
Enum.TryParse(loadDataItems[2], out loadData.LoadPosition);
212212
loadDataList.Add(loadData);
213213
}
214-
car.FreightAnimations?.Load(car as MSTSWagon, loadDataList);
214+
car.FreightAnimations?.Load(loadDataList);
215215
}
216216
}
217217
catch (Exception error)

‎Source/Orts.Simulation/Simulation/AIs/AI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ public AITrain CreateAITrainDetail(Service_Definition sd, Traffic_Service_Defini
919919
TrainCar car = RollingStock.Load(Simulator, train, wagonFilePath);
920920
car.Flipped = wagon.Flip;
921921
car.UiD = wagon.UiD;
922-
car.FreightAnimations?.Load(car as MSTSWagon, wagon.LoadDataList);
922+
car.FreightAnimations?.Load(wagon.LoadDataList);
923923
train.Length += car.CarLengthM;
924924
if (car is EOT)
925925
{

‎Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ public override void Initialize()
976976
break;
977977
}
978978
}
979-
FreightAnimations?.Load(this, FreightAnimations.LoadDataList, true);
979+
FreightAnimations?.Load(FreightAnimations.LoadDataList, true);
980980
InitializeLoadPhysics();
981981
}
982982

‎Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -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
{

‎Source/Orts.Simulation/Simulation/Simulator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ private Train InitializePlayerTrain()
12881288
else
12891289
car.CarID = "0 - " + car.UiD; //player's train is always named train 0.
12901290
if (car is EOT) train.EOT = car as EOT;
1291-
car.FreightAnimations?.Load(car as MSTSWagon, wagon.LoadDataList);
1291+
car.FreightAnimations?.Load(wagon.LoadDataList);
12921292

12931293
train.Length += car.CarLengthM;
12941294

@@ -1491,7 +1491,7 @@ private void InitializeStaticConsists()
14911491
car.CarID = activityObject.ID + " - " + car.UiD;
14921492
if (car is EOT)
14931493
train.EOT = car as EOT;
1494-
car.FreightAnimations?.Load(car as MSTSWagon, wagon.LoadDataList);
1494+
car.FreightAnimations?.Load(wagon.LoadDataList);
14951495
}
14961496
catch (Exception error)
14971497
{

0 commit comments

Comments
 (0)