From f8ab161270d0c43cea19021bb162b59c392a225d Mon Sep 17 00:00:00 2001 From: jracek Date: Sat, 12 Apr 2025 17:42:34 +0200 Subject: [PATCH] Bumped nugget version --- output.bin | Bin 408144 -> 408324 bytes src/lua.cpp | 4 +++- third_party/nugget | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/output.bin b/output.bin index 75894ebe5eec855962857e9bdbca2dc41a99d090..08b7e33b8460e24452f9591dc2461a05c011abd2 100644 GIT binary patch delta 1531 zcmZ{jKTI2E7{>1d2U(T}t3L4IzlS0CY@gxMI1QDYib@$6Ja}M8B?hBn6iXLy!Ie_U z5=cc#1_no|_!vBRs8j|IY-R9()C?UMJZA8~&`2H_+?G}hmXhbWQ&A(eNO%0+_j%vv z{oaqGcdZ@#tu^N+z7dLYJoYN{nHaoUf4FxX6v{7(qIedCvacv&8M0?_%;9r~$KCuG z^Byxzi%`E>kLH=XwS)5?|;GgsT*UHA_D z?(eLA&$^XR?qhRgiV7-wfr z<I@4MOp>3%C=KB)=M2-B(@8^ZrJ**`P;IIf&r@VrW{JVvrGeq6 z28!DTiuVna*an1ELo7+%5CQ2Y4O0;MDF|;;2%9Mg4N^G;zY>L|l*k{Y;53|v(+~5w zhT1&BGDCx;kuL9odUrv`q?e=;X_@3D-OPc`=Rl{V=cK13i=>kVv!J)Lpf;&VdO}(u zjUqTyFDW);Hwo$_al8SyYA3PyIn`Pc3yo&PfjpVPNwpc#lqcNkQpZ*u9ag8@xvdLJ zHgt5@It*6$D(i5$Nucd20imBj?u@Tq0>WW}2bxFkegeH~EGbgWCwR0t{`M4yaflaj zh}}5EAL9^hh;ofopkPu^8TMlkE@Gfg3_>dg;ecV0LTL_u%Q5&xsrsp2N1=A3P&*_u ziti4Wp-O8O#ke3#u12u46+upqprjoJHN&DIYhk#Q!*JQ3L2)sR;sDg6Fv@(rbKN%@o4JDF_YH8igW-Jj2l>gsVxHys|!tuVA3kc@qC!eHF(w zIH;lG%P*=ZE~qH(2C)pR@I?j@dV?rg3&MH%HiWZR-h3kRFG>pn&lsL@JRUrEekv_Y G_&)&0Jc(TZ delta 1186 zcmXX`y>C)c6z2eK&~!lifX8QVA0K_Z2b3C88EQge2Zjy|4rm-`?9e8}5^W4>6EQZ? zp#x2AZ~p)j85kIv$WW6ec3|j$Ne4$vI&|njwHk*G{tlGnzWhGU`Q3ZZdtu|R+Pzfk zkNt-(a*NOfj?ln#6s9 zU**}#(=}ZyY6($UeV(c&g!b?nzXX1CjbFuY4yw5X8H3V6&I@bk-H!Fkj+Jb;Xh!}t zX7WM&N;V9jWdj{GgLJ7HNV$xYQ}*JNm6ZfK zHsdremsl&X)-s`8>CjF%r4r?mC^qWq2oNUFf=)|Pu8--Sg;(m<~`jsfn$T>*1>0!&Px;hg7j5W*DdAvDxN*gFz}aU6l+;H&h5(Aq(` z4MuZpRD&=|OzlAwH^b1*0?@hvXlnsz0oIDF;=2!@&<`K1GT*h~gH>l*^kMe%KD^^|FX}p8(0woHW2RXz5_K=?8YRkwH1_96y%f?D%wr_Q^*p>1{A!n Yy>TkPw@(w670ZTY#~S%;pB^3i4+V8B`~Uy| diff --git a/src/lua.cpp b/src/lua.cpp index d0b9574..4d458f5 100644 --- a/src/lua.cpp +++ b/src/lua.cpp @@ -45,9 +45,11 @@ static int gameobjectSetPosition(psyqo::Lua L) { psyqo::FixedPoint<> x(L.toNumber(3), psyqo::FixedPoint<>::RAW); go->position.x = x; L.pop(); + L.getField(2, "y"); psyqo::FixedPoint<> y(L.toNumber(3), psyqo::FixedPoint<>::RAW); go->position.y = y; L.pop(); + L.getField(2, "z"); psyqo::FixedPoint<> z(L.toNumber(3), psyqo::FixedPoint<>::RAW); go->position.z = z; L.pop(); @@ -156,7 +158,7 @@ void psxsplash::Lua::CallOnCollide(GameObject* self, GameObject* other) { PushGameObject(self); PushGameObject(other); - if (L.pcall(2, 0, errfunc) != LUA_OK) { + if (L.pcall(2, 0) != LUA_OK) { printf("Lua error: %s\n", L.toString(-1)); L.pop(); } diff --git a/third_party/nugget b/third_party/nugget index c188767..7ed81a1 160000 --- a/third_party/nugget +++ b/third_party/nugget @@ -1 +1 @@ -Subproject commit c18876727ccd22f60093e779ae8a67047c956549 +Subproject commit 7ed81a19ce8221cd42c0d45d1b737953088bd147