From 97b2fcdace12f968dd2ba7754d3b14716db5e302 Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sat, 20 Mar 2010 18:12:17 +0000 Subject: [PATCH] Seperate trucks a bit --- maps/uphill/uphill.bin | Bin 4364 -> 4364 bytes maps/uphill/uphill.xml | 348 ++++++++++++++++++++++++++++++++++++++--- src/Train.cpp | 4 +- 3 files changed, 324 insertions(+), 28 deletions(-) diff --git a/maps/uphill/uphill.bin b/maps/uphill/uphill.bin index 8e53c717cb917803388c01fd6cce9e9b79b96fbd..54913e23e4aaf7ae578ef846f374a9b850c26c0f 100644 GIT binary patch literal 4364 zcmcIne`r=!7`|IM%R;E8va~dURMeKW7y!~oO5^1`#k4; z-}9dHP4GN#0?=h`WlIzVNp#ujfZt=peN6Q@r`tA})7F~SsMjnDFS@qeKWGZPbp}&R zyq0UKoz1u{F`T38xVAoQGu^h@(B}WGfgIbS$n^J*m+8JQSNn~eu+?(PP8IH<%=fAN zn!gcij#rLYQx$ypdUJq&(6s#u`lHSBZW;cVw$!$n%!qN8O$;D7k9zdm)P5C zQx`sFtlbwx;3llK!QOc<%g6((Wafx3WO?OI*B1S_S@z6ZA@s#H0`TE>YM_qiE=-br z^GY2jd5LE()JtFEQpxp0CjN0eld;Y2+e&KJIHC!SAfd+a~vz)&?L{Xh=dr3T-BK)UR`GQ8oW$%neI89JBaoK7}(dOcbExqet( zTqA_WCf5(jse6paJX^iU_cl}1u=$oXD3`W8BZQ8bXURao52#CVP0}1htdS#@J~1m7 zy_cn7L&Y$efA{@D%^DB(={v@=E-XstzjD4?Tp@&xxh|<8w?Ci}_B<)~|1@v?+>uwq z*4-OS)tJ}JnPnKW*g%-%azUYa>WmL98;RSOrVxmCy93spj>2DVAg+;Jf_u!wXsazc~$Yjw)}m zRo-MfR1Mhcw?xubZa>Mb{p6fDX0F}^VHgI5UJvfciBcDi#NBw=Y>NsciXM?C{EhOR z?T}BS{XjeV``lfM8k>UM6wb)uq}^m+dH=Y>7=mN)Rt&)9Eps=DdQqQxgZl80<2`Nr z(6-}z>@lB5(`2fDSdQC*Im9IYs!Z{}cXv46B&kBLlNtu~g=!czd%7XAHN zje<`2p(n+dP)7z)+Apf1rhSwlIIauN1_WM&P6K1kTE@FY-%QOV)p#?#BJ{xt`++PD zJLT{G6S5@S;l8n!V!uIwwyPh&Cz0bd6YghmcL`FkPbf3)dry$p7!xt0b zld(eobXyPKCxZJ$c_VyU3cX8+*)kUg?6ndx#J*cos(~$abP-$bZU~ zAue};OLJry&c=Ml%hvOD@ZDXZXAgc%5!ch8bI;s!I3PHVeXsy=c@y@xpl!ul|1$Pg z?D%;e=p*J!7`C~(!P-G!xwD~mZ^jQgx1@1rKya)YGHoU%%#RFz$lnj?J*%x`%l$Ja zsYP=$Hx@d-_R{+S!EuKB+PoNw2J$l=Y^e$Pny43LB z==VB*BsE~Y`wdDBYBSEWBF9J0B*L%=`FLv@kk?KJ>Rl&lP3Mj7k=P$T>UH*S=Hytl zYRfgbfAj<5=l0Kd5cC1wqn*4*FrOImAM{ixs3V^tYG59aTh9l6mqSx0zPH^_1I`fN u-RXBH?*O9QpJVF7LgdFr`pN0Y$Iow?4|*o3BXe)@4$ItK`E1+{4gUee)(xTn delta 1088 zcma)6O=uHA7~OADB$fmsEUnrcYGavHMe59VDE1OCsD~U1t%_@<2a9@AL8-+< zyM^i$WNRtnAEhUy^q?r@Xki-?LI};1CFzXrwP)70X~nVF2ghN2Iy4Xu7NbL4A>!~aXScO~FQJ}$)zRQ~0#EWWE24}MBSYm)weu zacJFyz=~6VKUD^{oraKdhqdNY#SpO!>HJUk-_=1lXPR;cJlodXvV_~L zqk3TSShoM=0P|_ zu0ea|IsDkX535cbir=CV*am;8=Fk3*>D}G~?Cs_gX^J!WRlN-pV~=2RY!W^`eF$P6 z5)1uT03mOKNX)-SG;u}n9OaObhw;2Fn;Q}s=Yn|>=0~5wvDiF39vz4E8|Nh!`%eMF zbCNfLe~pxQM%BE#Hl#&9O#ng&`}vlp@vUgd=hw9wAM&+Z%{5JX5c4S?4{&W)UAF{( zt#@!xRi22K_&dE_@Mb No Name - + uphill.bin @@ -19,6 +19,14 @@ + + + + + + + + @@ -35,10 +43,22 @@ + + + + + + + + + + + + @@ -63,6 +83,10 @@ + + + + @@ -79,6 +103,10 @@ + + + + @@ -95,6 +123,22 @@ + + + + + + + + + + + + + + + + @@ -111,10 +155,6 @@ - - - - @@ -183,10 +223,18 @@ + + + + + + + + @@ -203,6 +251,14 @@ + + + + + + + + @@ -235,6 +291,14 @@ + + + + + + + + @@ -243,6 +307,14 @@ + + + + + + + + @@ -251,10 +323,22 @@ + + + + + + + + + + + + @@ -267,18 +351,34 @@ + + + + + + + + + + + + + + + + @@ -287,10 +387,22 @@ + + + + + + + + + + + + @@ -303,10 +415,22 @@ + + + + + + + + + + + + @@ -319,10 +443,22 @@ + + + + + + + + + + + + @@ -331,7 +467,11 @@ - + + + + + @@ -343,11 +483,31 @@ + + + + + + + + - + + + + + + + + + + + + + @@ -355,6 +515,14 @@ + + + + + + + + @@ -363,23 +531,47 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -387,6 +579,14 @@ + + + + + + + + @@ -395,14 +595,30 @@ - - + + + + + + + + + + + + + + + + + + @@ -411,10 +627,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -423,40 +671,52 @@ + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + @@ -466,5 +726,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Train.cpp b/src/Train.cpp index 9b6d04f..e7a5a1c 100644 --- a/src/Train.cpp +++ b/src/Train.cpp @@ -104,7 +104,7 @@ private: static const double SEPARATION; }; -const double Train::SEPARATION(0.1); +const double Train::SEPARATION(0.15); Train::Train(IMapPtr aMap) : map(aMap), velocityVector(makeVector(0.0f, 0.0f, 0.0f)) @@ -116,7 +116,7 @@ Train::Train(IMapPtr aMap) // Bit of a hack to put the engine in the right place move(0.275); -#if 0 +#if 1 for (int i = 1; i <= 4; i++) addPart(loadWaggon("coal_truck")); #endif -- 2.39.2