From 5dc4c64b54b75a6886a235a468c44c168873c8bd Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 19 Aug 2014 15:52:47 +0100 Subject: [PATCH] Fixed variable key string being null --- Assets/Fungus/VisualScripting/FungusScript.cs | 3 ++- .../Fungus/VisualScripting/FungusVariable.cs | 2 +- Assets/Shuttle/ShuttleGame.unity | Bin 93756 -> 94956 bytes 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/Fungus/VisualScripting/FungusScript.cs b/Assets/Fungus/VisualScripting/FungusScript.cs index cb8372ef..3e46189e 100644 --- a/Assets/Fungus/VisualScripting/FungusScript.cs +++ b/Assets/Fungus/VisualScripting/FungusScript.cs @@ -96,7 +96,8 @@ namespace Fungus.Script bool collision = false; foreach(FungusVariable variable in GetComponents()) { - if (variable == ignoreVariable) + if (variable == ignoreVariable || + variable.key == null) { continue; } diff --git a/Assets/Fungus/VisualScripting/FungusVariable.cs b/Assets/Fungus/VisualScripting/FungusVariable.cs index b1989a82..65bc0d2c 100644 --- a/Assets/Fungus/VisualScripting/FungusVariable.cs +++ b/Assets/Fungus/VisualScripting/FungusVariable.cs @@ -21,6 +21,6 @@ namespace Fungus.Script public class FungusVariable : MonoBehaviour { public VariableScope scope; - public string key; + public string key = ""; } } diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index e43a687fa6bb294fd07790d25d5f58a665e6b1da..7c2d54bc15bc9c181c4be2c136382b3d6a02384e 100644 GIT binary patch delta 3468 zcmZwJZA?>F00!W55I0zuG(ofCSE_ti5wyBVs-P50u^>uis1#8^hhYk?l0}=vc&iJM zWHP&Kc)QI++?ItcE`i7bKh*fonz`7-Ir-rxQ*3hD< zx$TA9(;wcSZXz_vOK8hOLP#R+eLbdaWAw)P#<557O7zCjbn^m2w%|jmU&AmTtP=0z z^=sL;$(do;W+7*TSr*ECf^* zFtOoZU?YaywRfHrxEIN}9~EFHP;B^UdyRA45IhF+SmoS>t5vQp*bZSyF2WKP6XJ*c zq+gd{0ay**^X2@t_mX=Mrii`11GHz!jqEA^yd(&Vk0WGwns&91eO(gDmK**MHVzX9 zauVjrA*2oszrbG$UO#EcDeZ>o?JAR-t^=5`R4)8{D0f30OzhwUtly9uE%RxYSJoDQ?C)H=x5 zIL%+_>4ZH;eSBupndK7l1i*3%`*$H_I_mA~nXTr!TLfo*wbXx>-8_Ws|8f-Ca z09GWF&4O80%k?esS1O)HV7?H{MzG6ZIj|^9tZ*sJmPd#~D7y^iGnft54HMf~4jY-w zVgC8(R6dOL@J6ao& zf`s(Ktn1}mbL-u@08DInKWxB|qc=&t4M(XdZt5xOeYB~*Qz?}TR|CgkVrSf0TXuOi z$hi_&7fj5}KHag4l*zd{uqv3CYbXuw?uI3xGYWsEI}6@#=-)(0y)cDEFiSZh9vI(T zE|?D{R%lPT+!%&^Ba~eQ^P}LqF#b$g4I6>gz}OzbrI0+J2lM9u@S~Uy3&O;sxCRz6 z*jkvWLM~gt>NA*w)dv&nyK?7BW26G>FRon}Xnj*2U5!#E?@IpnIDfd^_qm&suPyKtN8Rj?G ze%Oc?>(6?~H`jupo&)Y``P*(GtP3WNBn?KkYY!i^G5N!y;un{N*XJiZuxDBrcWVYfQ3kmkj+pYCc| zHMOeetTc(f)b~*~eVjs*)m8^Rp3}lg;g5a)@q6~&%J1>z8@pf8msm*m#Z4mU=|mRPQ5); zjmE11FEzV(^Xy3Sdv;{`Jv-9;o*j99&mIZI~6!H_(>Sa@oTTCUec=cp%LG*zgN^#TJY|5u+` O?KDwSUw1V=9UD+ou$w3yZ!3(K$`~sQ)`HG-4zLiz8bfyL z3|SLF`#~t`5{fZ~n3+u!M~Yl9Huohgq{!99Kd0Ac$vGi<*Y!X*kiFxD3!fK!EqooeqR4$P)LLfD=5yx+pclv%zI@GG5rMTaEx7_SYYB0{ew41Oupq2eYLVEg zU#G4bb$j?Cw_z?ATjTBeFRDT?AufiH`?1k$X#MM|@Ls;~$1vkQe()zSFU*R9Pw=M~ z|9;w=TTOEL!ox5#j4k|lvFNbxX-?QYbQ?fb9v@t*X|A=xu3&QcVEzNsI$;rwmgT?SC~GT-A&m=h*0Q0%XGWjGp5E3oU#*i6_= zAt9^SDmj-0n|_6mw~+f=TJ&z1Mo)+l_7_YLdzTHgF({fA=2O@nSOius4Hk1bFvI?* z6N;7#bHUhL9xMnmFk|x_je<#ifX4y^O$sY1I^W=iO=7To77Q@st969`+oV>g|yI~PUj@~5grb?Wd82P1# z{cm2bYoEdMzz%MKrBv}nj5$X;>@YT01q�&tDks&{XreT`&iXy}6Us?l*%1P_?xh zLdr@$JUL%ONIP~!+!gUEhZ$-KG2yd(7AjzF7(1apdBzrov19kcOm)%k2>Bgw0OpfS zkb69Pd)B6|=T{wo*xiRB-rya)bmKPS_bNK!rtM1Yu#ReN- z4gfph4PUW6sK^Cj+6F$?mT<=Igt7CTfXyp%XHyea1YYWLH7q`jJA|VgHy?a*O!58@hX6x|(yp7(-@|*MM zTr%C^$ttDi{R^ek784tajrb2$&}-D=K12g5aZ{SwdkZ|{33R7_)kw|BBfDsvM^{Ky k9&;;Idwi|b?O9Bv&v?FX!(aVvwA?e1KsA1=g$^eF5AMHx00000