From 6c07f06cf1f91accd15a9134765887e514643187 Mon Sep 17 00:00:00 2001 From: christoph Date: Sun, 23 May 2010 21:00:22 +0200 Subject: [PATCH] Two days one door ... --- add-object.lisp | 4 +++ constants.lisp | 3 ++- game.lisp | 4 +-- grass_colored.png | Bin 0 -> 3812 bytes on-collision.lisp | 10 ++++++++ room.lisp | 60 +++++++++++++++++++++++++++++++++++++++++++++ small-classes.lisp | 31 ++++++++++++++++++++++- teleporter.png | Bin 0 -> 4295 bytes uxul-world.asd | 2 +- 9 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 grass_colored.png create mode 100644 teleporter.png diff --git a/add-object.lisp b/add-object.lisp index a68a2cb..1a14a35 100755 --- a/add-object.lisp +++ b/add-object.lisp @@ -37,6 +37,10 @@ for. Classes: ~A ~A" (must-be-listened-by obj place 'player 'moving-enemy 'moving-item) (call-next-method)) +(defmethod add-object ((obj teleporter) (place room)) + (must-be-listened-by obj place 'player) + (call-next-method)) + (defmethod add-object ((obj moving-enemy) (place room)) (i-wanna-listen-to obj place 'player 'stone) (must-be-listened-by obj place 'player) diff --git a/constants.lisp b/constants.lisp index c5527e1..c788c2d 100755 --- a/constants.lisp +++ b/constants.lisp @@ -10,4 +10,5 @@ uxul-world::room uxul-world::stone uxul-world::xy-coordinates uxul-world::bottom uxul-world::moving-enemy uxul-world::standing-enemy uxul-world::moving-item - uxul-world::standing-item uxul-world::game-object-with-animation)) \ No newline at end of file + uxul-world::standing-item uxul-world::game-object-with-animation + uxul-world::teleporter)) \ No newline at end of file diff --git a/game.lisp b/game.lisp index fd366fd..5b98d6a 100755 --- a/game.lisp +++ b/game.lisp @@ -12,7 +12,7 @@ #'(lambda () (create-room-from-item-list item-list)))) (defun start-game (&key (music nil) - (room-function #'make-testing-room) + (room-function #'make-additional-testing-room) (15-fps nil)) "Start the Game: Call room-function for getting the room-object to run. Music is ignored so far. 15-fps makes only every second frame be @@ -100,4 +100,4 @@ drawn (for very slow computers)" (draw my-anim) (sdl:update-display) - )))))) \ No newline at end of file + )))))) diff --git a/grass_colored.png b/grass_colored.png new file mode 100644 index 0000000000000000000000000000000000000000..60697a18a0c37606c7745e53c1d2afe791acad9d GIT binary patch literal 3812 zcmeHK`8O1P_kYhA%veXJD13~FBq3!t#?B*K_7EzPU6x3*V3f!bQYcG_A-inJG9)Tn z_DIGO*+;gCF+Dzi!1u@RZ_mBwo_p@=+;h*puV3!H4=v0Lxj9a7006j+jr1-903`wd zNrtl>BACsurw$z?=(3>>DC-qoJPg>bnHcJUzyE4(Q(@{Mf(S5j2m*kU|6hZE%;$oK zAbYT}sXqHSD?h*JxxKH9V?Ax_u<_N&ueT>uxLEt;XaD|nU-Qlk@o_jQja0c=Am=-vas=-5x$0n>^|0vw zgi(OHLsOo4NDXbj!$AZ(+syL4_nefrl{5ZniuZxz&ungL6IP^bL6Bqp3`3&kjLU`{QtnyoTcM-%zI?^s=kNG;r)) z{LHxf*o3eg%AynBtI&O#m-Pgifr!-Um}jY$Q!nln+4NE|&@T=|GEYk8qneDPH635J zME@wf19qfu<{fN!KEJsgLD1bPD77fx-RdEc#?}gsl zB(z&KN2)(4g6N1WIv3(AF5`(Dx3&>5Fc0*vm-JH2Px|d zEl)(u>~uz#n)9b9bHFpNlsjVe!>+0!mPCY?e@x%|h6ZZJ`y>O`F4v`zqXF0C(uzXf zmY;*(=L#Y?iv`zyl=V`UeyZNrs}P{Xcpmv%1W0IY79dZ9agU0KSF>YzRf$;h_w_BkD5$8qroD1dG*yZg*}U5_ zH#~xQlsyyR_xlVLwLT-dm|)}3SS0x8c<+xA5hU=>$!ToS?AF!SH$KTjkv*78oW;BE zpJqTDSSGvlhDWvTL6DTBkV%6B?Be6cOMc0geWgqB&|I4Gv{)mr6f_Kh!X*ag@c#`%~-u#6oR+{UiWaYgpHc1_}3k%x1ZmsPVP z+o)(4rtWFJuSkwxTuh7D5?kw|-L%IVFwVI)mqZBpuF+R^R&4RShvZs-xRPd`Ih}tG z3t-1gwelRB$Sgi7rIF&Lv(eWjz_llO%~h|bSC5YDQU98Y02bXGAc*@_jo;QQVb^t0 zv1WG_xirIpF7dj$zP32Nk}9IY$F?6?uCV3A)p`O6#N5O;@qRVBRF?%u9*CwTfSD$k zvixYwC2V;QBjg{OL-Rc0K@BnJNJ~0P2*G53kw>-lC;BG5Z7yVy`LRIM{0dN1kK23mQ!(cYNf8AjvAOiTE|&f`FkI3`|Rj zmx!qrex^pMf=Oum=bT^Z7=1o|6o^1olqY;i7!`C6HB!v`4eyoIk!;|pAPt457Dw)G zz7b`pE%QKV(IR|k2Bl2VgqAh+F6Dg`L*W$@D{4TGMst6@n{|vCy3=IpRtMp)cR&S1 zkgM0I_sGj_qSrNQosn@TW_V@V;UCKir*Y}lIO{~+rkbp3^Isq|S z*Oa5gLVN9O;gpb0MeWp;pfp~h7H5;`)k`Y)DA7+#AI=|Rx~>DdF??ua;6Y2lAL;Od z)fbigdZ1fz`|LCC&Wo)Z{ChAh5>{$Z3=6tz3MSh6HAr(61S>LEm93Yen-)b@CsC8GJ65iQa$(jgz zt0YZE5Ddmfmq$MY^t`e@WxBWCwj<4rlH5HS?{jNC1@_1X)=DVO7oj))Iw*4t2S4@` zrK5*EWZi(qfbfN+(MB&Yom4WN^Z{b=Ykyx5jw8|xs|K*ZIyp)aSt-4fI#nn@IWong zeH%A03hf>@Ue^E5?D7m}_vGeox(pF!zvwsg+J0=YgRtNs{uw&|5Of(N)P}^Tf7d22 ztuxjH;dnH-e1Wm5_FdS7q;&vSn*FCWuE(bOVt+%q?Yj_KUuAz1^;j7=g3k3zAs>?4 zqMCJijC`Z|5fp+fBWXo*)tqElR*~-TMnQ86Ook$vD=$`>um+`iOwH{)oPkcnlwX%A zkXW$D{MNk&$FB&*J~!)(M44zfA~=b(Pp)$3Kj5#5cuqE;7$mK(9Y#EeT^(P4BC^Vs z)M38QWCk{!YC0VrVj{;t5FFB@f~*H*Ar%5fBR&_XNzHDhk`GVtF-aI$>jq8-e#48; zIh-TFz4}tbC*M~Vqgq@9GrR2TGaYttVzNB!pX2j-xX4q-`=ePA`36`#5ISrqN zK6kkY-So%U3boERi$Jl0C?@gBdpPMi-sM~1c9LbtQF>n3?-bORv$H~9IfwP0A=7_I0ZBz@=Pch=$yGSlYZdx1(2UL*Y}F$Fi6D#viB%y%m8P;%}w zSns}$23J)SFcoe%O7@BG1>$zzp2ODa6@R>3&KdYUz2Z}hFal{lug5al|B+lt{D3$= z5^pI163ZnT%Xh_)6$rE`)#~F;TnJ0l)+6k!0nyS4 v0s}|@0bSiztpIe?L*W2@cs2iDR?$nyRbbq9m!BE>_a`vcH`6QAagF*fj)mM{ literal 0 HcmV?d00001 diff --git a/on-collision.lisp b/on-collision.lisp index 8647884..45d7d07 100755 --- a/on-collision.lisp +++ b/on-collision.lisp @@ -41,6 +41,16 @@ (setf (maycontjump moving-rectangle) nil))) (collide-blocks moving-rectangle standing-rectangle collision)) +(defmethod on-collision + ((moving-rectangle player) + (standing-rectangle teleporter) + (collision collision)) + ;; make rectangle active to check for overlapping + (setf (active standing-rectangle) T) + ;; walk through + (setf (colliding standing-rectangle) nil) + (move-about moving-rectangle (desired-movement collision)) + (setf (colliding standing-rectangle) t)) (defmethod on-collision ((moving-rectangle player) diff --git a/room.lisp b/room.lisp index e51b6d3..e041a17 100755 --- a/room.lisp +++ b/room.lisp @@ -172,4 +172,64 @@ (add-object (make-instance type :x (* 128 x) :y (* 128 y)) room))))) + room)) + +(defparameter *additional-testing-room* + '((14 8 NASOBEM "" "") (3 9 BURNING-MARSHMALLOW "" "") + (5 10 DOOR "" "") + (5 14 BROWN-STONE "" "") (5 13 BROWN-STONE "" "") (5 12 BROWN-STONE "" "") + (5 11 BROWN-STONE "" "") (5 6 BROWN-STONE "" "") (5 9 BROWN-STONE "" "") + (5 8 BROWN-STONE "" "") (5 7 BROWN-STONE "" "") (7 14 TULIP "" "") + (1 2 KEY "" "") (1 1 TULIP "" "") (2 3 DOOR "" "") (3 4 BROWN-STONE "" "") + (2 4 BROWN-STONE "" "") (1 4 BROWN-STONE "" "") (2 2 BROWN-STONE "" "") + (2 1 BROWN-STONE "" "") (4 3 BROWN-STONE "" "") (4 2 BROWN-STONE "" "") + (7 6 DOOR "" "") (11 3 DOOR "" "") (5 1 KEY "" "") (5 3 BROWN-STONE "" "") + (5 2 DOOR "" "") (5 4 BROWN-STONE "" "") (5 5 BROWN-STONE "" "") + (6 5 BROWN-STONE "" "") (7 5 BROWN-STONE "" "") (7 3 BROWN-STONE "" "") + (6 1 BROWN-STONE "" "") (7 2 BROWN-STONE "" "") (7 1 TULIP "" "") + (9 3 BROWN-STONE "" "") (9 2 BROWN-STONE "" "") (11 1 BROWN-STONE "" "") + (11 2 BROWN-STONE "" "") (13 9 BROWN-STONE "" "") (11 5 DOOR "" "") + (9 14 KEY "" "") (9 12 KEY "" "") (8 14 BROWN-STONE "" "") + (9 13 BROWN-STONE "" "") (8 13 BROWN-STONE "" "") (7 13 BROWN-STONE "" "") + (7 12 BROWN-STONE "" "") (7 11 BROWN-STONE "" "") (7 10 BROWN-STONE "" "") + (7 9 BROWN-STONE "" "") (7 8 BROWN-STONE "" "") (7 7 BROWN-STONE "" "") + (8 7 BROWN-STONE "" "") (9 7 BROWN-STONE "" "") (9 6 BROWN-STONE "" "") + (9 5 BROWN-STONE "" "") (9 4 BROWN-STONE "" "") (10 4 BROWN-STONE "" "") + (11 4 BROWN-STONE "" "") (11 6 BROWN-STONE "" "") (11 7 BROWN-STONE "" "") + (11 8 BROWN-STONE "" "") (10 10 KEY "" "") (10 11 BROWN-STONE "" "") + (9 11 BROWN-STONE "" "") (9 10 BROWN-STONE "" "") (9 9 BROWN-STONE "" "") + (10 9 BROWN-STONE "" "") (11 9 BROWN-STONE "" "") (12 12 KEY "" "") + (11 14 BROWN-STONE "" "") (11 13 BROWN-STONE "" "") (11 12 BROWN-STONE "" "") + (11 11 BROWN-STONE "" "") (12 11 BROWN-STONE "" "") (13 13 BROWN-STONE "" "") + (13 12 BROWN-STONE "" "") (13 11 BROWN-STONE "" "") (13 10 BROWN-STONE "" "") + (13 8 BROWN-STONE "" "") (13 7 BROWN-STONE "" "") (13 6 BROWN-STONE "" "") + (13 5 BROWN-STONE "" "") (13 4 BROWN-STONE "" "") (13 3 BROWN-STONE "" "") + (13 2 BROWN-STONE "" "") (14 1 UXUL "" "") (0 14 BROWN-STONE "" "") + (0 13 BROWN-STONE "" "") (0 12 BROWN-STONE "" "") (0 11 BROWN-STONE "" "") + (0 10 BROWN-STONE "" "") (0 9 BROWN-STONE "" "") (0 8 BROWN-STONE "" "") + (0 7 BROWN-STONE "" "") (0 6 BROWN-STONE "" "") (0 5 BROWN-STONE "" "") + (0 4 BROWN-STONE "" "") (0 3 BROWN-STONE "" "") (0 2 BROWN-STONE "" "") + (0 1 BROWN-STONE "" "") (0 0 BROWN-STONE "" "") (1 0 BROWN-STONE "" "") + (2 0 BROWN-STONE "" "") (3 0 BROWN-STONE "" "") (6 0 BROWN-STONE "" "") + (5 0 BROWN-STONE "" "") (4 0 BROWN-STONE "" "") (7 0 BROWN-STONE "" "") + (8 0 BROWN-STONE "" "") (9 0 BROWN-STONE "" "") (10 0 BROWN-STONE "" "") + (11 0 BROWN-STONE "" "") (12 0 BROWN-STONE "" "") (13 0 BROWN-STONE "" "") + (14 0 BROWN-STONE "" "") (8 15 BROWN-STONE "" "") (7 15 BROWN-STONE "" "") + (5 15 BROWN-STONE "" "") (6 15 BROWN-STONE "" "") (4 15 BROWN-STONE "" "") + (3 15 BROWN-STONE "" "") (2 15 BROWN-STONE "" "") (1 15 BROWN-STONE "" "") + (0 15 BROWN-STONE "" "") (9 15 BROWN-STONE "" "") (10 15 BROWN-STONE "" "") + (11 15 BROWN-STONE "" "") (12 15 BROWN-STONE "" "") (13 15 BROWN-STONE "" "") + (14 15 BROWN-STONE "" "") (15 15 BROWN-STONE "" "") (15 14 BROWN-STONE "" "") + (15 13 BROWN-STONE "" "") (15 12 BROWN-STONE "" "") (15 11 BROWN-STONE "" "") + (15 10 BROWN-STONE "" "") (15 9 BROWN-STONE "" "") (15 8 BROWN-STONE "" "") + (15 7 BROWN-STONE "" "") (15 6 BROWN-STONE "" "") (15 5 BROWN-STONE "" "") + (15 4 BROWN-STONE "" "") (15 3 BROWN-STONE "" "") (15 2 BROWN-STONE "" "") + (15 1 BROWN-STONE "" "") (15 0 BROWN-STONE "" ""))) +(defun make-additional-testing-room () + (let + ((room (create-room-from-item-list *additional-testing-room*))) + (add-object (make-instance 'teleporter + :next-room-function #'make-testing-room + :x (* 128 9) :y (* 128 14) + :active nil :redraw T :visible T :colliding T) room) room)) \ No newline at end of file diff --git a/small-classes.lisp b/small-classes.lisp index cd597c5..d1d8659 100755 --- a/small-classes.lisp +++ b/small-classes.lisp @@ -64,4 +64,33 @@ (dungeon :initarg :dungeon :accessor dungeon :initform nil - :documentation "To provide information in which room this door is."))) \ No newline at end of file + :documentation "To provide information in which room this door is."))) + +(defclass teleporter (game-object-with-animation) + ((animation :initarg :animation + :accessor :animation + :initform (make-animation 0 |teleporter|)) + (width :initarg :width + :accessor width + :initform 128) + (height :initarg :height + :accessor height + :initform 128) + (next-room-function :initarg :next-room-function + :accessor next-room-function + :initform (lambda () *current-room*)))) + +(defmethod invoke ((obj teleporter)) + (let + ((player (car (get-objects *current-room* 'player)))) + (cond + ((rectangles-overlap (x obj) (y obj) + (+ (x obj) (width obj)) + (+ (y obj) (height obj)) + (x player) (y player) + (+ (x player) (width player)) + (+ (y player) (height player))) + (if (key-pressed-up player) + ;; change the room + (setf *current-room* (funcall (next-room-function obj))))) + (T (setf (active obj) nil))))) diff --git a/teleporter.png b/teleporter.png new file mode 100644 index 0000000000000000000000000000000000000000..f3db38f989f6d71d0441888d60a8a471372a84ce GIT binary patch literal 4295 zcmV;&5IFCNP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igS} z5-0^o%2cugq(mKI`^m@u|AZs_;ul9a6h35$ zA_)ovu-EuuGBt_b*#iO=m;t*ZCT4f`0;aOEj;^jw@VG|8qXdxJ831|!G61<9Ujz6G zzyQD=-=ibtcg^@Yeeamp!1omP-2iaO_g?Vv7{D(8t^j=G^^bh*6VDd_&iHuB-?^8O zKLUY==fs33!Sw(PdGsmpT>yUp@SHdNDbKt7d=6k@0GRUmdjKQ8Hx$&ApB?dW#>bff zrR4Xd{BAuT^7$1%8v(GUwoBkTGM=Ty((WS)cZb)80Dcc(pYPr0XSaA?QVJpowEsN? zHZ={u0&vdjnF;)gpUe5))L3Y2K+So*Z@+UdOpte2_^Amhrx0@rHl@%3;E>w=l-IU- zqx%59Bp@<=PJ%0f-;)`c@jJu@BOaFkekP^sedl~$&;%5w;R4#&j-0?O`My~M!2ED~ zE}@Ikw|L&?YbONCDUTD=e)#}T%q(Q4iK&^D(6?|QIS}?JXz)AUQ`qlm^FIK1$IoVg zUm?o>WI#dSZ+zAOkU$F4RtbEETD{BjF|Qx-{f9gb_?f=_-|`CzyB~=GEotyK-1e6S zhFvnj$bNSW;4RNT@$r8M2!T=GduBd|z%^aqYkU>}a2qdeAMobxQJ_QK=v`jh;dOyR zbiZpXk(;11`~KXt7Zyb%CICeRNrO=O{Cg&ReUD(+rXUY!hI(WIIikG=FirV?PB(1| z@)m2nJ4`(aPlA+P-{Fmx_Dk@4Ch&rf2j+?ACj86}`4h7R01!Y*d(8o%zg4uoWww4u zlaSLaOzrwC2s@|dP^Oz?fxM-{cfl7X*h30;p8z;C5Nw%uFX8u0-~;m)GNb);0q~L~ zH{MM^7QCl45WymnJ{cjQc~bnpM`7poc>!QzX5rBTz(YC-UKGAVEkESV+oMx=V)lO! z#QB2;%})a-FIn>UIPI4U@(-)7!GxFd?@*+o=wXNNDeP~Wk}bv-a?Tz*07|=wnbGIA zId?jq7$6SG2t!`m;^Ura@@)VaYW%vN2_u)x7^9$IFZsWv<~wBe+QdLG+XM*O#sDyT zESrBy0UrQ(2H=H(V4v?fFzQclA@p@Kj<*S6JrR^y82Od4(^-&8-WUtyEfIQR;oXoF z|HAD2QvyK@aAN+z)-5&tAx3UM7}2bymOfUx`NEP-6N?hct^>dYpPT*OqoBV4@Mi$8 zXd{Od`o7uwo@q>1vzdi~|C0ZENjCV%#E?Kx(k~d@B?$5d5PE9iR$(^#2-U>QD{A>4 z0sP4_cUj=Xbye_9GDr#TD++f^Gw_MWjDSC*;745pKpNP<)Z+GI3jc_-|1GK<{kPQi zED(Bv$2U?&FP?{Z&D8QIUVqE$qr1!yX7`A2pF7{N`27ul?AP zw#NVhnS(wR0YrCjt3@2D>Kan4Gj4CU7 zY4=NA}rMx-YWnS3h@Q$ z-RJ35Xt{;DGWV%zzCe;h8Ly>a$Ed1_6h)QhbIq7Ex>0^0zXRd-Dg1Bfv3g0?KF_Ml zKd{#a7U##YdMJF}CKISwOLA4*>p&y6min zdUo;789=jFhp6W6zeAPQJv7=^t)A-i`uyYiQTVq4!3gyfvE%@w`w9I3nSyc?43HCj zn!i^W_7HVOZ#xit)cm^(2X~G7HQ}a-p>s0v2ZH75t{EVupr4|izI{pU@0;_d8ohzh zQuO$5KV)K(1D?z;6LSkB;9PRI6)WTLdt~_3~_Ke-VX$XAI!ZpqG*R zl=&3_@C)jd#&==@r2S85`(F|aYObJ(pPpr?qVVr_lnu^wX=Y$d)BFRIMp~~}-US0F z9r-o2|4V{l$721S#rXwdj(-zF3rAeBW+u;)f>+vjVbh8HhT6YPjekW3kk_A^!2417 z8)pD1uRGPHnTI3FM=WrT1=Gbh5s;EQFKPErY4<~0ueEr2^!PXC2dK<0GofojXlkB+ zYN2A*!~*LAAV-~pe!=4)pn3;DwELR{fP4Uf!3#q!2!!VVe&q3fkut911Ei$-SE!3O zUo#J|6*zlJ^+xL7?C_PxT3)7t5NBScia%IHa3cU{s`u0!zi;_`Xf{8$39>-&jcY6NHMC#l+b8Du$;)@`k8}I? z4}vt1mx@EvAWTdaC4$l=KQO@cHTfrI;|l{p-_RGw{hI+jFK~SgWlsN1RayO;06<}% z%DL60V_-kzOS_}+AC?8euBoaA*h9SrW7x#_=>ky5nb@+>&Ko()Ej48FMh%&1e;f}F z0t5gES;6IYt;a&%@P(p&6?61W*zRb=bZ@&r;9b_j4k~IsIa}oec>C0_YjqQv;%H}n zz*(U*S%))+jQ~(c;oUZ~fL5aIZ$A@=rT1yd_fa>cS}O{0dy$&Jv*`J^J}eBkveEOo ze83_T;B8GE2${VeNBcpL2L6Dv!%`EFG&mG#!)tN0Z=?Zpdqb%*lwZ0=f+1vw==pai zH;`H)NTEDd`2cE0Fbtf)q`{kvqrG_nIqO=iv(wJ{&jLmN>fM2x>Z5-v7*ey%a%$02V7M6|DNd zB<27*>jW-J2+f%QZ#bY8zFO)%z=pRki(?~sfY2$N+mhB1;f{jui|5;_#?d_>D6~I8 zwV3xQtc)*T;yD8In<_^8-wo%_pR2x8{TRJ!coquOw=R`0;GI3vXaYKy3n(yOBL1tt z*8~8!^D+MKZUhic;CYT`7McJDz$L0abHCvFp0+Ux=$099x%u)iX8<%YfM$+s-yU7Hif8Wbt7BWDF`Envn0G0T>Hg0;X zp`aLG;s6Qf0u%v^=?A>0FQC2ZW|0XxIVPym`dS)34H>}qq@AE@B%lq99Zg}B5JxwJ zuRRCfQL%q*9+@`S2{jQ=FM4fbUN(e_akO`c&0YI1Q8$u82!IrIZ@CLQCdLjf_y~Y@ z4`0|bB?#UE_@4v7J4cMnA@q6x?M{V2@X;Y`_n4yISn`U>toi^r0Nnnk0rj7o35X70 zx3qt13@}F3B!42>>bTCXolIH+hVsTf=(?e`Fq@T*n0H zL+bw+M+sm#5fI5X~tJeat7NBdI@4W$bslbxuS^!7`ry`DSf$T#p+Uvq8!^93JD zQ8$Ljf*&doR|s_h2u~y5kFIzvsgykTd~6bI6yd%fY4# zzz{*u{)j-^{c5A{d=&tIx-`6L>+x6^+I|KIw~r|({G%YOU+4sSMex+lv#9-@94VFg zB2?T(CP4LLpHSD73j~cD55&etZR&X6pya?2Q*fOAx{NTUXUhyFku?T!Wng3HjP zFJgcabxC;H5Mv^mfzCt&Dh!#RniCkT!vJ#rv};J%D>w?i-6JdsdxvVFuNH}{1b})3 z9ASP>V4p3FKxnra&;pSUsH%d0TGt0CP_+|Fme~224(<*EfSSJ+10;dguWAn)S)jeb zm;Ai%L%9wBv>Z$&VRIV}Miyv22*PQ6`E@Jn0YITYLA_x_z61nubR!>dg*vIX5C91U z{t8v@c)vmDaXPsD+8=Hhsf9k1RSY2S-**RH)+938|8|1_s1tT#fR%}$fyMttwEvx@ zeko^$I;}s!ilR`>9*G5fyZE>~tXmFXxC2arhK0UO04PlOzTbSZfCVB5+U@+Q9PBOD zSR1HCA=)-R5Apz!1-cai`ucz^tWgx2HK51aj3+Aq6i53QKmho09RSEajB&j!45Aa* zNd}NFkfEB_nXWPc1*+uF9_kKa;kL0c8PrV%c#9<)N5YVzKEdbaH7?qOD2{eBfaEm* z@EmKDg-oAniX`#{_5{;5mVys$f6j z=*E}<_#VJtslfeJ08oF~u-B~Ue-?89onivtI8xo<4^~A1-Y8P-;@vTf#h~ridiMj= z>tPpFerIVOpfm;uTgFbK;5(uDP22wtDEuLo%m#W0s21aw<^z<`2j~OncNjov;1g5}L!Se96VgMI6H(sa pdK~R#0PO(3OAriEZ5s9K_&)%!Eh|LY>B|5B002ovPDHLkV1hV2_znO7 literal 0 HcmV?d00001 diff --git a/uxul-world.asd b/uxul-world.asd index 155cd02..b11d187 100755 --- a/uxul-world.asd +++ b/uxul-world.asd @@ -11,8 +11,8 @@ #:cl-fad #:lispbuilder-sdl-image) :components ((:file "uxul-world") - (:file "macros") (:file "constants") + (:file "macros") (:file "xy-coordinates") (:file "collision") (:file "files") -- 2.20.1