From 879f425667abc413957e75568b0dae8f75fe69a9 Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sat, 13 Jun 2009 23:46:18 +0100 Subject: [PATCH] Fiddle with coal mine map --- maps/coal_mine.bin | Bin 16908 -> 16908 bytes maps/coal_mine.xml | 588 ++++++++++++++++++++++++++++++++++++++++++++- src/Game.cpp | 8 +- 3 files changed, 588 insertions(+), 8 deletions(-) diff --git a/maps/coal_mine.bin b/maps/coal_mine.bin index 787a36530f007268ba291e2ec35b2cc3eeab557d..d749a40461e48f7cb945060dd610058e95f12113 100644 GIT binary patch literal 16908 zcmdVg&5NX06$bE51XtO)%F3Oq#IMqTkfdsr)$Cl&Dr&G*aF>-U2LwTAa4{xQF`^(e z2-yXMEM}@fMMEly;40wSf54SQY47izda7a&JqT${1z)!K(0uo!>k z_@&vq%UiSW9)Dr>{_?5W503vi{cyQl@0n+I!cz9uKGtWCali2T+~i+Vf?s-w=WuT9 z{QUE?`TXg=_Y=)E_BZa?*jFZ#-kRf`u$375<@_7{IXb>~{MoJxmdWIEv-g(IbTJ+= zhb?%}{$=^Y*=zILeZKwKAMtJ-TVX5?PpA6X7@LDH_IvjnJ3L2lKtFxP@ec=V^kvLE z@Al6=T5EzOT<9CIkMB63A72sNgaiBBo&RX|?Bvz1mz`{gZ|!Nlmd(W4*g=;ue$yYn zd(Qhf9(>6)`@=&Y9mbQ3`1a1G@J6S1I*D~8{CZ}SHk>4u#QT>f-|YUz9i8GDR(>GX z>9@Cd7bon(W5wp3&Vf0wvLW^*MznMW$C%&AL3-5;wMDBxoOrLXsyFPQGdYfv@L+Ft zX!VoPu8ix$2i$Oqd+}htz32~*`YPwE_OX$@Wy7s?ebiSqp?JdOXt#Q~s+%vg{-gH( z0$tm(>|@5S`lE+_VqaXbhaVDaIM>g2`Vvp@n3on0V*1<1$DIS~*s8T=<&&$-Imp;W z{+8V@@Zy3bhWI6TGv=M(M$U-?dH>(@X^#UOWc(liA7axDCt|JQ1CEL@K0WSvgQIPp zPJ8akfsfB$?(qP-wPHZtJcKz1U9#aqj#XY&--a8x6E3tc!d|F@!Y{r^ z<@s)I=l#KQ{Ib2SqrZ44d)V4^_FAP4C#e~DF(*8Y`;UAYS2N@n-sBv8;bgn*b$(QJ zqn`Pb{WuU0FtNXIoowYoxDh)!SFEwte0-)xd#}1I-|qB&996s=J}yQlT*d)hWP5I% z7x3pknjFgg0dBlFZ;TQ5h47?a*>lu;=x6cWZ0P>y-#Sm`FTz1a`@~1p%%^(&bdKcC z4KtkD^yU8PKBnJVF}KRcQT4%}*_5+GEc4SA7s{Az_(&Esc0h=XwO#mVnlF5I1c=lJ#BhY#Op zc#}&w#)bXl-=S+n>OuU21J5LZDF*m1=RnoZ`liq)C)9-G1N`y=Cm)~xrt=|I%*$Cp z$H;s3Iz-FI>a`e$bHmB;76A$M*W~81{uRXCrJRJ`o2a2dQhg^Q^7s({;Y^w=*GUsB;8=IKYuMzfIV` zI4C>pMc;~>ewKtAZ8(d4*U{o%US{8m98^6>zO+4i9-Ak22)pGu|B8p48(RJ1OsuFQ zYH7|)^Xb7ey`JeR-MBsJYja-HVeC3^M+Z(}XQO>^!3L5!yKP(3Yh2Ib0UkC*6OE)iJhr^^Wg! zi%a~moA2RQ7xQ~;?gwm#8?V;jSxo86SphHH=F*e8flFtP*fBSHHul%=+J$TLTUTM- z{I(xkt%H#*iLLm=UgCC@4~@f5t~=qHUcP3l8tATohx{%}H-FlfZPt}dC!N3GhY@e7 zqxj6dGd$v(jn9vwzQ4+~Wj{0ckpI4Q{D*#542CaHe$wv_>|qPv!C!HZ^Q2;v z58hp#bREx5-tIgUm$%n7g%4A^==7Y}hK(KaI)XcM@Gt*@Ke+in_dM-}gIo6-<^{pS zKK%M{z#r@qt9<_F<#P7S1^;Pb zOl`JL#>A94=HrTuSr0$#Iis!7r!}`hn||i#Z1K0{a`Ef=M~h}-<6+ri;$l4D02aFW z5C?x+{-g6Cp6jlByK`$E|MQtxjW2P72jglYThxHm6fw%Db#@$eTk$GCa_@qVB(Lcp z#_@m~VqBlKc!ino*se8)T{w91=(meV)4gc+?TrT<@PYW@5BEZGaCiPr+v{%64Yni? zZ~!ZNtFQhItaQW8a&G|cBnx7I27wSSdfS<5MO&hmm^esIn+vyC5g%3iPC9Ri z1$gWwmhk`+$$6q5UOvY|aw2hpr^J%h9CNL)2M*wWZu0jo&4ykVp&!9aq*xKBPbR`347KdV{m@-~tcCI{4v)cO2t?eRwyHtMDu* z2oA(O`|XJjyu(44HFA~MOCP<}TXvqH(`yYa0hwoelM^jdMC9 z_`nPQ@gp3;Q~t%t+Rug>*8Yx@W<$T%_BF=5!xa9sh3#}5AFzd2Yxe!o%_bb+&2JrQ zcQ_E!xN7t6wLR~*HsZd(wzW;sZ$4iq*R=Q$i|lOk*7&pLkZtmjf1D4_FK4hCq7Rme z!MYlKo%g zEF2x(`6?Xn1kE|>&QE< z!_-LjtE;P;*lTCb@J(&ISPz$yoOqD`ZI8|YJUGc&fsvyi^J>3}gI%4E`yCHMPIf<}9ymMQA)OgHA9wA;Tg7zF z{+{!@(>e#q1M_iGvVZ;s1&_Idt^Ds>%D1q15WjqfvxhMU-kZt+Oq)39^|}9MBL@7g z;JX5Td7M~y7#?mm2Oak+F2!e$&3-0`1^Aoad(Du~6~|Y{?>4Xb{b;k#<}4`AA11D@ zYt71^LrvVARj@kih#U~do*#^Z!izipuQ+?S9J(&7m+4^}eEbU|eC4C$M{>Bn3C$@? zSL0b>Uf0U-uxm%_zt`s8CvD%}?#_AC?`(xT_(xmEvD_6Z4nFz+(=|Og@B6)Q)C*Iv zx5q`>yGzr(@NWEZ{=wPy>;Bh{wt61(AonD3@}M?09Yej{#16l=vHS2he%I3caS#p) zx15bsy~9uS^>#0o2jyaS-v0{+yLMma`_1BDj8*=Q&o{NI?5(=>AkS6X*8eWCu5~S@ z?uEyj#=+_wXtie!u+1>N@)3kD0o~v=~yy?&SRysNl(SK9w!S=bZt_7bOdw6PR zZO5+GwYz1ncj2PN!6I>j7ya!HcCeb*Y;JX~&VToV`W9H<|GIr;t_Usucrpivc`n_1O=u_U{g7?cbu# z+HXu}?b~^=EA3n23{UOb@~nMZp0#hRGkti|@4fv-)p-hcbm&WKu6ej5@}h08c03jy z#6gR_em{~2L>~_1G#=tZzS|YPGtPECPhRV@*1I{@B?kC9V%%Ks(JhY}emV76IB5F} L_nytUh=czDoDDeA literal 16908 zcmeI3ziSjh6vr#~KYoaHfQNO6S=M<{-78LJ zcfCybq#qc-qu3P|j7uM6BTun_Jp3p<7)J;7Nw#v0H58Yu!?TF>w3cu~uGSVF*iRp0 z@Pj9Fr7yZcjL`=QQp&{FW4aqo3t)+S&wn8t97tP`oy+^ZCqPI zjoDah;x&<{wS@!g%fINvIDF`V?oi12t?L@=+Zq>{CmaKY%n!9M@W3Z>Ru6+*)`8+R zV!Q@*^P<_>W1UvUP?jHKeB2*$Vtc?*SfH8`(;#dE1@!qW!E7hYy-&~9n z55xjFL%rDPxn)vacZ(0d5zESXa)P+$+wxjjdjCJIDzp8S$6={_Sp4YU_x;2Kn1LVj zsSVW1HYU1JCxwB|(Zn`&4?lwgaUcv%WiKrko)p*172gLQ{2l>r`d$PJ?HOIE5mpcE z8z-C(wEq#?*aa5EyYd11$qO*~*?-~jAXdm7c)>y6HQ<2U-HPAck{j^wXTa!NWqG)7 z;&W;QxuBdNAGD{^#(QQLG1v-Qa)taRMu>BMOHhp9d+Gu2#0wbF@=h!uX~J zEW+=r*rxL%^^~~h3`H$vKLs1!8S9$8JJlDQuot_D0rpFBg18BL1m7Fvn9s9LogJpZ z1p9~$VnTZi`4GOp7JYrBKEOAP+^+E|Z^#+^FFdFvX3GGFgN;G#Gw=`&Iz#>saS&s` z^C18Ey=72O4|Y8mwLiTl1QG%XfrLOpAR&+tNC+eZ5&{W*k$3Fhyll^u_dlL?${NO!{If4!L{|SxVEp6<+skZ~4#$@;DYQ|{cx4Y;bH@jy&|S&x$4t!%)_?%XzZ|G2R`mkoX3 zMnCU%x836;?2tj9TFC}C No Name - + Yahyahyah + +Harbour + + -Grimethorpe +Coal Mine maps/coal_mine.bin @@ -51,6 +55,14 @@ + + + + + + + + @@ -67,6 +79,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91,6 +191,10 @@ + + + + @@ -115,6 +219,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,6 +267,14 @@ + + + + + + + + @@ -147,112 +283,556 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Game.cpp b/src/Game.cpp index 7d28dc5..d6d02cc 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -171,7 +171,7 @@ void Game::update(IPickBufferPtr aPickBuffer, int aDelta) myWaterMeter->setValue(8); - //lookAhead(); + lookAhead(); } // Signal that we are approaching a station @@ -201,7 +201,7 @@ void Game::lookAhead() TrackIterator it = iterateTrack(myMap, myTrain->tile(), myTrain->direction()); - // Are we sitting on a station?' + // Are we sitting on a station? if (it.status == TRACK_STATION) { setStatus("Stop here for station " + it.station->name()); nearStation(it.station); @@ -305,8 +305,8 @@ void Game::onMouseClick(IPickBufferPtr aPickBuffer, int x, int y, void Game::onMouseMove(IPickBufferPtr aPickBuffer, int x, int y, int xrel, int yrel) { - myHorizAngle -= xrel / 150.0f; - myVertAngle += yrel / 150.0f; + myHorizAngle -= xrel / 100.0f; + myVertAngle += yrel / 100.0f; // Don't allow the camera to go under the ground const float ground = (M_PI / 2.0f) - 0.01f; -- 2.39.2