From 95fd24101aae4b8292d9d8dfab71f9cb88dda09f Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 7 Dec 2016 16:21:44 +0100
Subject: [PATCH] Fixed #4
---
bin/de/deadlocker8/roadgame/logic/Board.class | Bin 5493 -> 5364 bytes
src/de/deadlocker8/roadgame/logic/Board.java | 40 ++++++------------
2 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/bin/de/deadlocker8/roadgame/logic/Board.class b/bin/de/deadlocker8/roadgame/logic/Board.class
index 2f0a0796736ad3f2612c019aacdb82b891f6fa83..57c8bd9335e70decc0b5a8ad7f84bd7d51ebbc47 100644
GIT binary patch
delta 1091
zcmeyW^+i+Q)W2Q(7#J8#7!I;CFflSHPd>;dw^6T>or95~iHD(?p=GiGhr{H0j&xZS
zh6FAKMuu)41|tSzE(R5bbS{QIh6(Hp{frE1AZ?QySUDtk7$!34Ffy>E7M3RF6oZtd
zfQYQg?>III%-~_DVW{O|;A5D@!!Vm+&g2c86^sifC$K0^mf_;$;$m39u$YH|lVQo^
zSgtz8b(8OK$=GgSWZ-qmPb^ANh%U*@NiDYJVpz+t38ZQ>BZH`hPgY`CqJB<dUb=p8
zNl|8Ay0vB)NX1qjhHVVnC!2Cx^Y3J2V2lNc?FNbMnOx6p#IcrP9}mN7hBcdaa-U)5
zoX)_`z{bG9aBFfOzXp%0mX0WkC@V|Kc812u=lPW(0xSultRMky0jPi|D@y`Mz#S&Q
zk^)iDETB~H#2~=Hz~IBc!QjUr#Nf{$!w|%v$q>R|&Jf1n%@EBH!4S)k#t_d?#gM|#
z&XC41l_7&+B||R5HimqLBMgNMHyBD8#2FYE>>%!9kYJEx0D)T!<qUcZj3Bo%v@+;1
zFfnj2Tw-WrU}Ior5MnsN;LG60z``J7%&?EapTUoTm7$%1fq{pC5vr_%ftewYfq{XS
zf#n~AH#-9#Bcq-k$P`dSrwhu}cWTMVvZQQd=-S56vyGv576U8u8Z8-?1les2^)nfy
zw6`%#f^xgIF-%6NkY!1LtLOolkpMQM6QP171!2ZyEg3MkYa7EPm<pCP3=9mm%nV`-
z3=C!rybKHs)ePJWwG0Xj^$bc3EeyI0Z46Ef9SklEy$t>g{R}A#6B*JNrZE&U%wT9^
zn8nb+FmJM>kUj4dhN%op4D1XH3``8uCie;%8&2QGFf&||Wha9tBg3r!k99UMFfg!y
z?Ga;OWnf@f%)r60ltG?hIfE9%QU()-Rg*soDay}fU}IonkZ0g#2w>1-U`7f^J%+gq
z9g_`(m6+!-%%2=4JiC5Dq_m8zD9d(+MIf^wez0TUXJBAh&%ng6fq{i#BLf@5CI(K1
zEewhb+Zgm1b}(2l>}GIf*vsJ0aDX9(;SfU_!%>D3hT{zN3|kmF8BQa`{xoRpGcinI
zSjynXz{tSDFo|IqgC7GE0~^BxhUHugehkbEoD97TD<)To1T(K>ST*^Ah$ia=22O^H
zlmCgxN33R8!@$VE&A`Cm%)kszK9ai`)<z1g-_Ed6YYT(mHij)iJGL?G+QzUK<O3#f
a=&*qmUIV)Xl!O=<B%v;0WY`Z5-va>G74F&q
delta 1180
zcmeyO`Bh8c)W2Q(7#J8#7>=?tFflSHPd>;dw^6T>om+(=fs>(`p_QGXWpV+BHg6k4
zJ0k<Ddyr#rFeAfcMRtYB4Xm89Tnx<&ojeR(3_6SqY^jB%i8;kw42%ptJPf@IeUsO-
zJMeQcs4%2}h;$H<HTgYzItL@ebRGsH2II*aIW`H*;bEv@sO4hdW0=RoFrQ(;<YLYW
z#-)=JSQIDU=j7z#VpzhkoQHvvVZ~$xt~$m|ljn2E*luBD;C0GREJ{&`F3HSEEw<%i
z*vPOAq-r}OgQ$j2R$^JAeokUux_)p;QD$DcwPqMd#ZDfET@1S?|KPIb-^<9r7z+~H
z4-z{t*@@eTV<W>M9)|S{8#dQ)pJC>_&A`sU#=yYHH#v}BL()il8$;tJhNf){9kUoz
zwRA*TL|Iu<wlj23Zsk`7%l4zlvLuMIf@HTqWhbD>in6jKfMg#-WhbJ@vZO%t3JECH
z2Qi2+FfjNqa4`5W2r>9G$S?#kXflK_m@$MgxG+R8L@>lLq%tHh6fq<*G%%zvOkv1k
zSjdpWu#O>*VGlzA!v%&ihPw<E46hif7=AF+F!C@oGKe!UFxWx-#vs8U$-n^eB||xb
z9s?toHHkrwfr){Gk&R)pGXom~GlLMr9|m6rKL!>C8HP^`{tSK$tPE2a7#MgM7$M3S
zrZO-y1Tru%@G`LcV~Aj9;A3R8wzg(q0w;rK0&?|@S~9XMDccyPZDW`K4ntPvHCi$(
z39{Q5>Sr=YX>VibhjOQFW0;6gA<L2gS1|!(MgrK3MuZBM6oeTQwPe8DY1<h3VJcYG
zFfcIKGBb!VFff=g@G>wkv@>usbTTL~bTcS1OkmJun8e`3FonT|VJ3q=!)%5WhPe!B
z42u{F8I~}#F)U-~U|2QzfS^6^42GEuObqM{3=B*RvnKNh85_>t#xOTrl4U1@CnLkG
z|BrPxFfcH%fb9`uU}a!nSkJ)0u#rKYVKajk!$t-ZhHaAzgcRi$GO#f)F~~D;GXyZ`
zF)$+nl0lDQA;Z+k8-$dY7cnfJd{t<6{gOy&8Cg-5?F`F6W<&g7$H33Pz_6QviD3@|
z3&UOpHimr+oD2sT6d4XN=rJ5&uwXdO;L324!Jpv_Lkz<?hBStY3?&Sg8R{7hFmy6p
zN5nqEG-&KIF-&1t$>7Jp$iTudiD4Ck9|IEu8^Z*K)m#jI49pCi4806%CjS%;W?sv%
zZnD3KChHvrPKLXaYenQE)-!BiU}WHCU|?`&U<M^02FcwF8zY4_Z)e!5wS_@&8^aEv
mJ=+-eZDTkH@&OY#blAWOAAwy0N<s__l2Dg0G8_hn?-2lL+6$uq
diff --git a/src/de/deadlocker8/roadgame/logic/Board.java b/src/de/deadlocker8/roadgame/logic/Board.java
index 3a7dacc..ab24c7b 100644
--- a/src/de/deadlocker8/roadgame/logic/Board.java
+++ b/src/de/deadlocker8/roadgame/logic/Board.java
@@ -81,49 +81,37 @@ public class Board
//North
if(!containsTileAtPosition(x, y-1))
{
- if(!tile.getN().equals(EdgeType.GRASS))
+ if(isCrossCheckValid(playerTile, x, y-1))
{
- if(isCrossCheckValid(playerTile, x, y-1))
- {
- freeEdges.add(new Point2D(x, y-1));
- }
- }
+ freeEdges.add(new Point2D(x, y-1));
+ }
}
//East
if(!containsTileAtPosition(x+1, y))
{
- if(!tile.getE().equals(EdgeType.GRASS))
+ if(isCrossCheckValid(playerTile, x+1, y))
{
- if(isCrossCheckValid(playerTile, x+1, y))
- {
- freeEdges.add(new Point2D(x+1, y));
- }
- }
+ freeEdges.add(new Point2D(x+1, y));
+ }
}
//South
if(!containsTileAtPosition(x, y+1))
- {
- if(!tile.getS().equals(EdgeType.GRASS))
- {
- if(isCrossCheckValid(playerTile, x, y+1))
- {
- freeEdges.add(new Point2D(x, y+1));
- }
- }
+ {
+ if(isCrossCheckValid(playerTile, x, y+1))
+ {
+ freeEdges.add(new Point2D(x, y+1));
+ }
}
//West
if(!containsTileAtPosition(x-1, y))
{
- if(!tile.getW().equals(EdgeType.GRASS))
+ if(isCrossCheckValid(playerTile, x-1, y))
{
- if(isCrossCheckValid(playerTile, x-1, y))
- {
- freeEdges.add(new Point2D(x-1, y));
- }
- }
+ freeEdges.add(new Point2D(x-1, y));
+ }
}
return freeEdges;
--
GitLab