From 0ad32f629708e62ddb689a2240849f21b5d7ccbf Mon Sep 17 00:00:00 2001 From: SlyVTT Date: Sun, 7 May 2023 22:05:25 +0200 Subject: [PATCH] some small improvements + added tile background/foreground color change with subimage DYE effect/clear --- assets-cg/levels/fxconv-metadata.txt | 2 +- captures/fxlink-image-2023.05.07-21h43-1.png | Bin 0 -> 4663 bytes captures/fxlink-image-2023.05.07-21h43-2.png | Bin 0 -> 3999 bytes captures/fxlink-image-2023.05.07-21h45-1.png | Bin 0 -> 1824 bytes src/level.cpp | 47 +++++++++++-------- src/main.cpp | 10 ++-- src/parameters.h | 9 ++++ src/player.cpp | 22 +++++---- 8 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 captures/fxlink-image-2023.05.07-21h43-1.png create mode 100644 captures/fxlink-image-2023.05.07-21h43-2.png create mode 100644 captures/fxlink-image-2023.05.07-21h45-1.png create mode 100644 src/parameters.h diff --git a/assets-cg/levels/fxconv-metadata.txt b/assets-cg/levels/fxconv-metadata.txt index 1682884..eacf730 100644 --- a/assets-cg/levels/fxconv-metadata.txt +++ b/assets-cg/levels/fxconv-metadata.txt @@ -5,4 +5,4 @@ tileset.png: type: bopti-image name: img_tilesetnpp - profile: p8_rgb565a + profile: rgb565a diff --git a/captures/fxlink-image-2023.05.07-21h43-1.png b/captures/fxlink-image-2023.05.07-21h43-1.png new file mode 100644 index 0000000000000000000000000000000000000000..07aaa090b3c78eeffcf0a729f9a2e6ac01e06c83 GIT binary patch literal 4663 zcmV-763Fd|P) zt(F|g5ruR12=s#(7%UJlSh&z|fuVsOz(7#IKwyEPfFD4>&|snALV*PX3=H-`3J4fv ztEZ-`ySnl(^4^I1ojohfjHWv?;^ytBtg5J|C5hXdl3i?;bTWG{QHS&}i>D=}^mP^e zH>Z~`-+YVI_B++&m&&ix@nySWDaSRECMMFuT+SwS`eqaBFPE=N_N-SwZQ=6DDW&w1 zf%6*yFiVbWBuyNo2LxVMQkMc}^_NpNk#wxyxhl%;{q%K>c6xJ~t_1`+u8}n7B0b>n zs**aV<(rjUyd#I_NWHWE@r@*3)o3NJJPtHDu8AzoSx66PyvcuDrR9}pl^o?Q`<2w@ zrRK^3S&o@J!kE&uM|!~I+u`2YP_|#Dl#U&g?N?HlBggYgmArCa@a4EAnlvqu9*}uj zvUjY$wf!>FC5@-mOZ9!_!vo-x#egD#tZmr8xrWff2VR6+w<`{7JJf(gQCJO)8ok*Lad` z&32@R47(njn3UwWgVZxSZ)Ojmp3&(%lFRmcsq*iRo{R5$zHsb`LJz03a4CV+q=shEK83QXI&kc1 z#5<0g9hXm09`21xUQ6bBS%BAt*BAUK;p>4#1ALX#pq$|(OjXrB`1aJ7ae82>r^rld zM5+)zEw{+3w&2?nogOHBipiw9X9zz%vZ@TeJ=riq5BNSsvnSOzF(a}vda1`;sJyf0 z(gRxF*Kkx)9rJ;ljD4b2RlN3OLti~0*HZ*0)hi8*pO#x9SQW25QR@NLr_fEROY|{A z--1`G;W~x5u%Cn zDVo7F0?bj3z=s|X#*bA=Rm2e?h?rPbRX9iw_o&kYLOu1}+_zuD=uoG$psms?riaLq z>63M-hv_pyF)2oeVj)PNf=sg=I-i0tDPD(K(g|cF`%nzB1&|3k*26@fnr~9P4#kDz zpgEq}IEZ{|vPrQ!6#gE>8mQ3q0%}t3^)O|2Gfj%!p%`%%Kxfmjhr*|(nUoKQV%dXO zLpR`i08S)`9*lizj!F4&C|(={)4>#Q0Qad0CgsVYxb`5{z=re)u!9e!2eX-4o0KPq zVuv)aq{GGs)~8HO%AZ3q?m?`f8$9@c1M0!Rr|eA1pF{b8D9A)Z+A(;KTC=lur#eDc=soz6Y@eb|SC?+Y($4gM4bNN%?jt ze*gv_a7b|g@u`6(6~Uo=>_LcL_|pS|PmMCE2oB{Es4PGYCM?r^YKTe2aVSrF5TYHg zdYJ1|{d=4fIn<}W{BZO8@BjV9cqBF)obQrO2*)g2RVZJXDf6vRMX&zoolT0!p)&8j zf4=_KkDt9dq7htqISM0ppJi(9+2j1?^As?&bb{*++t#a zqz!P4_t864QtS@(`JbOtdRzCqbbC^%ZN3N~kAH+7Fz0JoPqms9yF;a$dy}p?KHn)j zQxD~#e1Tx*Q%xqt?ojXk_O9_2pr-SX_W8~QfBb#*KrvqfpL(kPpk#Nb?l2zu9l^4g z@)SL zFXp5uqoDfl0MZzrK^LGO*NO7GPicJa#l11d-LLTM-}G)SQ2loRVUG{{_(yX*KBxO; zwDY4W95N}2GU^4S{yT^?#HV{PRihK-cb^0CS=-PrZ(r_S{^|KSrL;8rRNrFCTP1Y{ zss9cl?D1hA|7Z@!=a;u{voYQL5`@Pa=VWD+7);0HN+*u#c$&{)C57342M6}}u#bN< zMe+IR`FVS|hsFbwVl1Oz`|p6z9-l5dQ`I_Ae)l;NpY^WO)|h&2ocG$9a#cy;_urWd zdwkf(KboTWEW<8A=+54~dyHjNcXY4TJz63YbJj=Tjm$mTZA4d`3n8GnYf>ts#6H#O zmQF&^ewt5}ln?@%+j~+fqmp57Z|cyMMk&-}tD%n4O2aBO=+YrPo!XqFx+UPWoJs2)EPHw5YA9lb-gDARYuwL4+60#0~L;lr{$j1#C}pP zMPeV%I(tE{q=xnn0#TkN?ERS7$KOczs){0>uS^Q6jCx@}{~$nns(Ac#CG7o}%*T(W zmd;jX7|*)9`Oqt=GyVDpp$Tpd?ERS7$KQjVR)rnUm$Q4IWmG@#&y|1=FDBqg!B_Pa z6{bN@NwxP6;>zM^*!wZDkADO$RTX|b&nAUjMz!=0qO&K1ohkNyOqS#4(odaL+3TTn zX9~KKYUv-uB`+J;`!TVP--hE>#S+h_1-p!@z=1s>hxZD{_wGqZLpdH^=t`;-2dWaH zBR;NHf2wE}3OHwf_5>K@n|Q6Hq$mRp2ARH+@+T%CM!;KD6<1PFll1LSP@xWmbY;eo zP!o6N^sOWz20^!QSWSv9&=o|OBOnpN&NW9$li~`o5P%RZBGZlYF8ynWg4>Q=YXp%} zlDc-8)z8cN>|SI4not@NVl<^bHKqU5j7tz|``5&DC>2v?NMMIB@8>n?I;ryhH8BMw zgaO4qW!ry>W8*xyLj|9{4Z(wqJpBokRB8VjoJ%)COay8HBAOIb zfS^!hx}%WZ11BM$Tyl^yEsAJQ*>I^QM#({Eo=dinChZ(mYM z2tFlU9cQ|(E+Cpzl24T|*QzcKwalEhQazIfD6>IU+u3Z_`q@^yLs{lRz4kY?&Q zq#5;-+9IE-!``a4J5vw$s=6boR8t@o+kR4@8|PQZr>Zfts_BP&Qb-F>JLOjp^pncS zr&=(us)>ht5=J9M!cae{J>*l3jJ7KK!#(Mtol-rhpVR~7Q|%10D&xaF$)F2mkBU)0 zspCkXy=c$oDW#8p|Cq1Uyd2zJ3aIsWo_|k2{PEPDIc2{WENhw4q>_}{mByT|ed-=v z97;*=2+>03IJ>t+$9)}XJOEr$I{o}{=O6s}uOAv6O1bU}h(jHOwUWw6yWOeI@1RyK zN^y7SmT<92CBjJxAu^1Mm-TS(LJqpDN{D@+?5T*SrD}y^PFPkY#1{6|N?%E>QB@_x z8ccgC zYwyDqj`U*()Ea5Nu6oyUn8p$zG*ENZ2Lo%^73%dig|J^`z4)x>>~hbrZjNn!3xjp$z^s}j8QU2&HEq3W(8fUcxQ_pgyv z2`)O@)1>}Tr95pHDCRX&qmfk!WMVF{JZtDm$`Vyo0uu-J)X0rWDn%`(F373`0>RhR zW%{b5ZlJ14%*B&EwR5|YO5uyC3+z_qGATPKUw|~4$#*;dP9$d0&|T)&1?pMzj(jM0 zE2*SnY6aKlv)3$?qO2j%ZX>Fs4#6TI>N=u3MA2Xw=M?rTsl--HjqZ}Ca1rVzmm_+RUP^CQHICtM?s)C6gL9`hR&fG}4Ph!XI zY=@PUO@AEwddj`5r!b|e8k$P{{!pbHGAXW|DYO1KW)lfmIDnC`*5+QXX6$`Wx@SQ- zt)`%oN-CyyY5(kv6Duy1+2f3`2vt(uXc3~SCuAD4qs%r^R!JolQ;*2;2{q*{>&ZL2 zWKQ|rVURf#S5msR^Ejup#GL!G`p+?8^LvwV&E6DY z&Ib7f?+;~j8m;xV7zaLu(|^Yqi;Af(pz71?M1O~S_dNL2nEpFhb2K58E7|22uRoOK zrAU1)=F~pAxMKPCf1T#@hw;Ud-MS#~)>Gs9?*!bF$_iMY-E;g|WRqXC{!sRpbN6i3 zLh4fp{da`82b4ai+;GylpA?r*jqblQ-G9YUhPST+>kl>Smbl`3_l^+x{=R^Rcvq}1 zLGX917dF2W7xj=X2--)_M83Bx!nEV$cW&7+s#S}8Dj-)U@`7B_>7MBaMg#jv$){r8 z+jW&f$McVn-{}sOMn8ywYad;7`HUSDj9UAr~wDblHXFG94c8ph#{s=;X@Q;qM`DF z=1|G_X))1!3V+W6e0W=+28^HIQUDz)*+0@Mnol7^8d%a{CrMZt; zkKj{iI18Y&>DYtsP-(77CGS3kwr4>Uy5mfo6k2{up>U`)-K3ItpTfa$&>T-~94ro% z5KJoh^(mY^3y@)qW6A_^@>>d#LnRQCN`8F`fgphjGR=0l94g_MRPyLk2zwUbA?l0q zWD)XP3Y|lx(fy=Ksp~(L0OAOU&5A9J{OD0h5BI2xJVGR~Oe$6RR6>>JtWjaw)B3l3 zSQVz~wp2$OWNL6Gm1=z|@rY&|$o8~-1s_(0OiP4u;x^=wR$XXR@T?H4dMbr$!}QjnA+i5}qMh-PJ>6q&WZYCw843X~RZ^Mm^;8DuQ&je}PqeCP z+)NQ>cLY9@O2d3A&AyIC_H-NstD-)WOC$qIlS(6fD$V#5l|9vgU{&MZaU5Jq;Mr%IxrI@Vy^tQZ@an;d zNo6F>46hvfB0Xf-_29~+GLfapF2@l_59~NJsZ2C!`jF!|qz7Kynp7r&G(E|2G|~ej z&P^)gRhs_fXoK{?MF^A1c#@`9Ia(q;un@?kGVIdyEk}E#2YkYrREANS5#%@v=>eIb zCY524W*j-rMS8#_v`J-ABp9+ZWX&n?+FFoVjx4iNa!J8m)pnkUB zKhIPVqZ}%T)rkGnVGqEY#nc?J0(ZlShKQZu^|{~KeU7)0?u-AZ?Z!9*KI*r&%yrFm zsI_eW{2dXT6S@)Om=|5<$tm152Lvx-#ajHbZDyF7o*yD8S9j=s@~<RLF z>Xg`7pzgBQ*he8cqlORL9Ba_5ot<^i#tEPvK2`z$9P#B_+|ApwlxP)D!Ekm{q5RA042_B=G6(CLi%KX^rHsWnsYvZCIo&DL&0br#{hK_BG}T zB_5$HADTNdd>K42-3rN5A>=NW_DyMgDsGy4JND~{;(&+6YhP5uzq)F`!)YbrWxkL_ zUE1!Ze?y^vn32CFc)~tG2@!kS<%JUAFi2m&Nb1C!#Nr=BODR~$hKLYIb{Qi1@h^~Z zQW`C(S}KV_RdsVNntWtyp{cfy+3=5Z()FF9iuac&^ zQe|KvA+&1Y<@oO!F5RWMR7OVS>r}9cnZ-#E@lI@@M$lr>X3BdESf2Q>lc;>)K;LggGYhmx+CZq--A{OXaQ#sgOB2BaDf!J3omF^0TZ5&q7M+UfenvVy^;Y#c!VAojFXa2 zRq2{iC&nU*Lzw#i$iYH%Yf6 z?AL3Dm71lxp5harJOSqiL!~zp=TLz*e8QdE=?rNX^G8WK6rW@hYf|xE-6635?{GY& zMLO7^03Kj@P9x+I+RRxGuX#b6P@VaiOe^~9bayuO8&x3LM}37M zT*lm4HkzbyI4kr5$)LoyN{cP4(GH%9Sy1i(ClZNj&>A0=gUiN6Bn~CaM5MhiR*kZd z|40i93S!XN1$ateg6c3Q*q|G6(=sun-=0}67u9XovXCfvv)b@<_j;DrBaH!ji(uR> zU{frAFc-?V`u5UpcD{S%WY#HZn}E%q;cnJY!ad01g$;*!Npl9 z?X#J5uY}^;3TgA9AqC@VMa9Y=X~tr0>*YX9SOq!F&^zz;WT#oh|pFHjdR!%Ws!Ot5xO*!foB5!ZVQrX(Du_u49=>L~Tg4=35X&H~kX zgfNA$(S$%ctA6zRAk?ru61KMH7IVy@x1lWvHCh`!g8ng#8ZwIMYTbDSM-L6xsf;_@ zS!aFUkgz9qc<qjAheKa?)wkxk9EXi2yo)$1 z#k4BxNhtvpStoRFhdSO(IJKOx+=(muq6j{ZptFKra=mrDp`de|Rb4X#=(hs>U*@B~ z`W3>^z34}l^3w|otG+uIMaU||Vsdz{66vw1Hs)wy51YCxKbf-UM8PBa2R1w84br$% zAZjxl0jUW;5vHYGVyGT@^3_@;h*~p$Ydu_w0qI@=7j6_jK6Ua*s4_v-5%s6mk6t|x zK(7ese<%w8*DpCzAa3P^b3PPLlI-0VNw80q&}eP_EXq=3I;Gl~}#-+s`EbtIc8Pao@a&I;wPN!t9rh*c!; zDR_Q}U?8bFcV1%ld__QmxTL^^NGN#K{SV`hnUXdMl1_iLq6hg}wG7Q09}m7=f5P13 zmn0cQr4X$v=*{6Ogadt|ppuP94YU0gm<-E6TJV~zqR=&2wpCL{Z^z%gnlacjelVw? zFLCiB`NuZ+R`U-X!@`~7u+6gg>n66IhJ(0fuj@*_m165~A5SPKQ*p{l;;O^xLEO{2 zscipQM1+$auv*FHYzF+76$F!`*QRb?QkP@VCPY?=XG+G2%)^NuP|#Pauv`<{6Mt_K z-ke*Fm$^zz*(8Wt8<`Khb&OujdEjn6HizUNYu;tjm;_xuybLbU$URnzVGN zv{87r!R7c5w4|zxvFgi|1plpL)6*c9`G-5a_DVd$R8Fq9o4c5TO}%FO@eXgw$&O^3 z*p}EV@@V+%T3)R%Q{e>DY5+8>XD_E1+xRULe23@6Ut=xGNc<{dZ%KqN_ZuA>#F1eA zu};BpN8Gu2?4ju5!A1AugE(uI-fm>svFXb`oKfiO)CYxJQNH3Y-!$Cap}<{dhk(Gi z@FFgkpAK`9@h#*b|3)!s03G=v&^INrYO(L=4K0f`myPkv5BYSL&g$yiKesBf%3^Iu zALQBGY{(mCR+xJ>=sd!=)lQ@+w{~*SljAhZYK4(;>!%71XDCjmEdTA7u~5w!PqwF@ z?`XpEcKgPBM8D+D25K+6W%fjOpiK=$Y16Uz(!^C6*u#kD>Rhxt-r0^7X z)G=S&ZqNI*$i~n0%VQ?50Ko(AnGYw0rhkhCI!8Jt6D& z0v=hWiVm=L^N743og;2`zzeT=+o3um8YSFHCT=C!WKqJ-F8xYJ&~?6J-`u&*U@7Wy zXejzjUWUR0{J3kbP4aK@Z8wAZgtGANm0FpcKKC=17>**Ko1hdFeq8Xs&FErZUTl#x zXtMQm;0p+D`c1b_Wva(2_!H@vQdah15DsJm*@(RsbC_8S5B`GHCLS1gM{aT-9F(>p zeJ@h<@$wl&+@mywt#F(sPcKH0-vebD#G$yot|u5K;YCd}bDWOjjljd5fql zA@&Ru+G`qXo+2sid@rded8 zUO%Hygumr-{_`jyy+Ax>jA>D^x7}Bt@0$4Gz_V-HIv|yfoy<9K#JDh}OOw^LG`@>E zslnz@(Y&yh?)Rl3X}ro3P?d4}tAYT=EBHL03y~zrH)#?E)d#9Am-2ge7JBqv27EJK z-cHvVIKFzb{bw}kcCvU|vGNm>BI}Iv#c*s-d9^Z_?HGt$*LuZXlkpD5NdHD^H*0yx6=jp5Kok?11LLdkX|Xq{9s& z*`a;r>}X!>;t^rJ+i>xe%8D-+^jjcD7kl#jB`zTfvfvYU&o`VQ?K z002PU-VTKZ090-&*RQ?a|(+@B2y6v z#MOWRL_jL6=uuzMqayvjqWxGmuiah;+^|@zn{wQ7^uoI7pZ5uCT4SAM;;RLDPN#kJ zx?F;ndxrz1!qV&qfYOscl?`f2WW4G1OVMj_B}s2M<(j<2g0*`jk{X7|we+aq4Nwze zT9PX(dVJmsZ}jM1TzfhductDiYv2iY8a1=9&N>tA(_}po8h~yt61#aqmm9qY3;>Sw zZrmA%ykH1=$h8>9|}<&Z*@K%ofefG zVgBQ82`e1OW3UoDN76=fi4Cv-6E)*#w1X9U_98f(PZtHf9w;cOKBA3?r+^TZcn!Ha z;QnDW!i)+mCWCf6m!@7gtcKEp>W};ZTdFB!1GQdFRjFetLJj{u&9_tONA0+7_>~J^ zKoPCSG%#%S+s72DIod{OPiTuGDnt035BF@xOoRH&QKjYS`HAPO+lg?icN6o?+0yZ@ zwox?2MJ0lmHF)2R>4)*#M+f?3oTnXe)vBy%L)6y;!d6FqbPpSPpX)Zr$lCJcdsBP{ZYUg60#Z^_b)CjQ47j@DzoI14Bjrhf7hZ(G`BFxVt9o)7?$iFN3P0d`qz}#LKg@Me7qtl$Xv~~Y@`VOv+q2w z%%dGsePD5t>zEGA(Z(4b4Px%Yb{Lv6sts(~G2kQ(91XHpUT+HdtomORbCZ}&sByxa zt?E_xY{NJBUp^u#VsD&~P2i@*uoS;l6Wyngl>%7}K6F{mb=_$ziuLbm>&4?n#fZ!_ zOFl7<&t4lJ8lDr)J1Hzd&3+lp+(y{7p4f6(12r>2z>gyG z5gl>rio}IO=(#3VGFSCPM#{ql5CdNe6TOR;x8^G2!6NB=>}qP7xQ+No_@9>g=jFk0 zDAr(w27EE>y2CC64%Mg2O95|ZA!^|r$;v!r_A2+38?cUYQ3Cmx*z)3ll~N zC;@_=wUIBi=t)=xwX|Z_0rR6N4?=L9%*JqhdD=9Xs=(PDABVJ4w4KySXT%l1x|pk2ODy8O#1t0seY4hd}#GZnf(v5{;Ell)(gE( z-{?1AlgI~K @@ -25,6 +28,9 @@ extern bool drawborders; extern bool textbacktile; extern bool textforetile; + +extern uint16_t tilecolor; + extern std::vector MyLevelBorders; @@ -97,36 +103,39 @@ void Level::Render( void ) { uint16_t xtile = (currentTile % map_level->tileset_size) * 16; uint16_t ytile = (currentTile / map_level->tileset_size) * 16; - azrp_subimage_p8( i*16, j*16, map_level->tileset, xtile, ytile, 16, 16, DIMAGE_NONE ); - - if (textbacktile) Azur_draw_text( i*16, j*16, "%d", GetTileBackgroundINT( i, j ) ); - if (textforetile) Azur_draw_text( i*16+8, j*16+8, "%d", GetTileForegroundINT( i, j ) ); + if (u==0) azrp_subimage_rgb16_dye( i*16, j*16, map_level->tileset, xtile, ytile, 16, 16, IMAGE_DYE | IMAGE_NOCLIP_INPUT, tilecolor ); + else azrp_subimage_rgb16( i*16, j*16, map_level->tileset, xtile, ytile, 16, 16, DIMAGE_NONE | IMAGE_NOCLIP_INPUT ); + + #if(DEBUG_MODE) + if (textbacktile) Azur_draw_text( i*16, j*16, "%d", GetTileBackgroundINT( i, j ) ); + if (textforetile) Azur_draw_text( i*16+8, j*16+8, "%d", GetTileForegroundINT( i, j ) ); + #endif } } } } - if (drawborders) - for( int i=0; iA.x, (int) MyLevelBorders[i]->A.y, - (int) MyLevelBorders[i]->B.x, (int) MyLevelBorders[i]->B.y, - C_GREEN ); - - if (drawnormals) - for( int i=0; iA.x+(int) MyLevelBorders[i]->B.x)/2, ((int) MyLevelBorders[i]->A.y+(int) MyLevelBorders[i]->B.y)/2, - ((int) MyLevelBorders[i]->A.x+(int) MyLevelBorders[i]->B.x)/2 + (int) MyLevelBorders[i]->N.x/2, ((int) MyLevelBorders[i]->A.y+(int) MyLevelBorders[i]->B.y)/2 + (int) MyLevelBorders[i]->N.y/2, - C_BLUE ); + #if(DEBUG_MODE) + if (drawborders) + for( int i=0; iA.x, (int) MyLevelBorders[i]->A.y, + (int) MyLevelBorders[i]->B.x, (int) MyLevelBorders[i]->B.y, + C_GREEN ); + if (drawnormals) + for( int i=0; iA.x+(int) MyLevelBorders[i]->B.x)/2, ((int) MyLevelBorders[i]->A.y+(int) MyLevelBorders[i]->B.y)/2, + ((int) MyLevelBorders[i]->A.x+(int) MyLevelBorders[i]->B.x)/2 + (int) MyLevelBorders[i]->N.x/2, ((int) MyLevelBorders[i]->A.y+(int) MyLevelBorders[i]->B.y)/2 + (int) MyLevelBorders[i]->N.y/2, + C_BLUE ); + #endif } void Level::RenderSelected( uint8_t i, uint8_t j ) { - azrp_image_p8( i*16, j*16, &img_selected, DIMAGE_NONE ); - - Azur_draw_text( i*16+1, j*16+1, "B=%d", GetTileBackgroundINT( i, j ) ); - Azur_draw_text( i*16+1, j*16+1, "F=%d", GetTileForegroundINT( i, j ) ); + //azrp_image_p8( i*16, j*16, &img_selected, DIMAGE_NONE ); + //Azur_draw_text( i*16+1, j*16+1, "B=%d", GetTileBackgroundINT( i, j ) ); + //Azur_draw_text( i*16+1, j*16+1, "F=%d", GetTileForegroundINT( i, j ) ); } diff --git a/src/main.cpp b/src/main.cpp index 4d5451f..ba1abf5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,5 @@ -#define DEBUG_MODE 1 -#define BIAS 1 -#define NOBIAS (1-BIAS) +#include "parameters.h" #include #include @@ -70,6 +68,10 @@ bool drawforeground = true; bool drawnormals = false; bool drawborders = false; +uint16_t tilecolor = C_BLACK; +uint16_t backcolor = C_WHITE; + + static void hook_prefrag(int id, void *fragment, int size) { if(!screenshot && !record) @@ -286,7 +288,7 @@ int main(void) { // all the stuff to be rendered should be put here - azrp_clear( C_WHITE ); + azrp_clear( backcolor ); render(); diff --git a/src/parameters.h b/src/parameters.h new file mode 100644 index 0000000..d7588c2 --- /dev/null +++ b/src/parameters.h @@ -0,0 +1,9 @@ +#ifndef PARAMETERS_H +#define PARAMETERS_H + + +#define DEBUG_MODE 1 +#define BIAS 1 +#define NOBIAS (1-BIAS) + +#endif \ No newline at end of file diff --git a/src/player.cpp b/src/player.cpp index 4c5baf1..cc44e27 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -1,3 +1,6 @@ + +#include "parameters.h" + #include "player.h" #include #include @@ -78,15 +81,16 @@ void Player::Render( void ) azrp_image_p8_effect((int) (this->currx*16.0f), (int) (this->curry*16.0f), &img_circle, DIMAGE_NONE); - - if (this->action==STATIC) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "S" ); - else if (this->action==DRAFT) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "D" ); - else if (this->action==WALK) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "W" ); - else if (this->action==RUN) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "R" ); - else if (this->action==JUMP) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "J" ); - else if (this->action==FALL) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "F" ); - else Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "X" ); - + #if(DEBUG_MODE) + if (this->action==STATIC) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "S" ); + else if (this->action==DRAFT) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "D" ); + else if (this->action==WALK) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "W" ); + else if (this->action==RUN) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "R" ); + else if (this->action==JUMP) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "J" ); + else if (this->action==FALL) Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "F" ); + else Azur_draw_text( (int) (this->currx*16.0f+4.0f), (int) (this->curry*16.0f+4.0f) , "X" ); + #endif + }