@@ -1631,43 +1631,51 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
16311631 FrontCoupler . Closed . ShapeFileName = stf . ReadString ( ) ;
16321632 FrontCoupler . Size = stf . ReadVector3 ( STFReader . UNITS . Distance , Vector3 . Zero ) ;
16331633 if ( ! stf . EndOfBlock ( ) )
1634+ {
16341635 FrontCoupler . Closed . ShapeDescriptor = stf . ReadString ( ) ;
1636+ stf . SkipRestOfBlock ( ) ;
1637+ }
16351638 else
16361639 FrontCoupler . Closed . ShapeDescriptor = FrontCoupler . Closed . ShapeFileName + "d" ;
1637- stf . SkipRestOfBlock ( ) ;
16381640 break ;
16391641
16401642 case "wagon(coupling(frontairhoseanim" :
16411643 stf . MustMatch ( "(" ) ;
16421644 FrontAirHose . Connected . ShapeFileName = stf . ReadString ( ) ;
16431645 FrontAirHose . Size = stf . ReadVector3 ( STFReader . UNITS . Distance , Vector3 . Zero ) ;
16441646 if ( ! stf . EndOfBlock ( ) )
1647+ {
16451648 FrontAirHose . Connected . ShapeDescriptor = stf . ReadString ( ) ;
1649+ stf . SkipRestOfBlock ( ) ;
1650+ }
16461651 else
16471652 FrontAirHose . Connected . ShapeDescriptor = FrontAirHose . Connected . ShapeFileName + "d" ;
1648- stf . SkipRestOfBlock ( ) ;
16491653 break ;
16501654
16511655 case "wagon(coupling(rearcoupleranim" :
16521656 stf . MustMatch ( "(" ) ;
16531657 RearCoupler . Closed . ShapeFileName = stf . ReadString ( ) ;
16541658 RearCoupler . Size = stf . ReadVector3 ( STFReader . UNITS . Distance , Vector3 . Zero ) ;
16551659 if ( ! stf . EndOfBlock ( ) )
1660+ {
16561661 RearCoupler . Closed . ShapeDescriptor = stf . ReadString ( ) ;
1662+ stf . SkipRestOfBlock ( ) ;
1663+ }
16571664 else
16581665 RearCoupler . Closed . ShapeDescriptor = RearCoupler . Closed . ShapeFileName + "d" ;
1659- stf . SkipRestOfBlock ( ) ;
16601666 break ;
16611667
16621668 case "wagon(coupling(rearairhoseanim" :
16631669 stf . MustMatch ( "(" ) ;
16641670 RearAirHose . Connected . ShapeFileName = stf . ReadString ( ) ;
16651671 RearAirHose . Size = stf . ReadVector3 ( STFReader . UNITS . Distance , Vector3 . Zero ) ;
16661672 if ( ! stf . EndOfBlock ( ) )
1673+ {
16671674 RearAirHose . Connected . ShapeDescriptor = stf . ReadString ( ) ;
1675+ stf . SkipRestOfBlock ( ) ;
1676+ }
16681677 else
16691678 RearAirHose . Connected . ShapeDescriptor = RearAirHose . Connected . ShapeFileName + "d" ;
1670- stf . SkipRestOfBlock ( ) ;
16711679 break ;
16721680
16731681 case "wagon(coupling(spring(ortstensionstiffness" :
@@ -1682,10 +1690,12 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
16821690 // NOTE: Skip storing the size as it is unused:
16831691 stf . ReadVector3 ( STFReader . UNITS . Distance , Vector3 . Zero ) ;
16841692 if ( ! stf . EndOfBlock ( ) )
1693+ {
16851694 FrontCoupler . Open . ShapeDescriptor = stf . ReadString ( ) ;
1695+ stf . SkipRestOfBlock ( ) ;
1696+ }
16861697 else
16871698 FrontCoupler . Open . ShapeDescriptor = FrontCoupler . Open . ShapeFileName + "d" ;
1688- stf . SkipRestOfBlock ( ) ;
16891699 break ;
16901700
16911701 case "wagon(coupling(rearcoupleropenanim" :
@@ -1694,10 +1704,12 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
16941704 // NOTE: Skip storing the size as it is unused:
16951705 stf . ReadVector3 ( STFReader . UNITS . Distance , Vector3 . Zero ) ;
16961706 if ( ! stf . EndOfBlock ( ) )
1707+ {
16971708 RearCoupler . Open . ShapeDescriptor = stf . ReadString ( ) ;
1709+ stf . SkipRestOfBlock ( ) ;
1710+ }
16981711 else
16991712 RearCoupler . Open . ShapeDescriptor = RearCoupler . Open . ShapeFileName + "d" ;
1700- stf . SkipRestOfBlock ( ) ;
17011713 break ;
17021714
17031715 case "wagon(coupling(frontairhosediconnectedanim" :
@@ -1706,10 +1718,12 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
17061718 // NOTE: Skip storing the size as it is unused:
17071719 stf . ReadVector3 ( STFReader . UNITS . Distance , Vector3 . Zero ) ;
17081720 if ( ! stf . EndOfBlock ( ) )
1721+ {
17091722 FrontAirHose . Disconnected . ShapeDescriptor = stf . ReadString ( ) ;
1723+ stf . SkipRestOfBlock ( ) ;
1724+ }
17101725 else
17111726 FrontAirHose . Disconnected . ShapeDescriptor = FrontAirHose . Disconnected . ShapeFileName + "d" ;
1712- stf . SkipRestOfBlock ( ) ;
17131727 break ;
17141728
17151729 case "wagon(coupling(rearairhosediconnectedanim" :
@@ -1718,10 +1732,12 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
17181732 // NOTE: Skip storing the size as it is unused:
17191733 stf . ReadVector3 ( STFReader . UNITS . Distance , Vector3 . Zero ) ;
17201734 if ( ! stf . EndOfBlock ( ) )
1735+ {
17211736 RearAirHose . Disconnected . ShapeDescriptor = stf . ReadString ( ) ;
1737+ stf . SkipRestOfBlock ( ) ;
1738+ }
17221739 else
17231740 RearAirHose . Disconnected . ShapeDescriptor = RearAirHose . Disconnected . ShapeFileName + "d" ;
1724- stf . SkipRestOfBlock ( ) ;
17251741 break ;
17261742
17271743
0 commit comments