From 28b1b211861bb52ec6f00eb8da5d2f93e4a7e6cf Mon Sep 17 00:00:00 2001 From: djonker Date: Sun, 5 Nov 2023 09:07:07 +0100 Subject: [PATCH] added some sprites --- assets/decoration/armor.png | Bin 0 -> 2774 bytes assets/{ => decoration}/barrel.png | Bin assets/decoration/chandel.png | Bin 0 -> 1334 bytes assets/decoration/faucet.png | Bin 0 -> 1152 bytes assets/decoration/gbarrel.png | Bin 0 -> 1253 bytes assets/{ => decoration}/hlamp.png | Bin assets/decoration/hskel.png | Bin 0 -> 1795 bytes assets/decoration/pillar.png | Bin 0 -> 2013 bytes assets/decoration/plant.png | Bin 0 -> 2174 bytes assets/{ => decoration}/slamp.png | Bin assets/decoration/table.png | Bin 0 -> 1689 bytes assets/decoration/vase.png | Bin 0 -> 998 bytes assets/{ => nazi/guard}/die1.png | Bin assets/{ => nazi/guard}/die2.png | Bin assets/{ => nazi/guard}/die3.png | Bin assets/{ => nazi/guard}/die4.png | Bin assets/{ => nazi/guard}/die5.png | Bin assets/{ => nazi/guard}/fire1.png | Bin assets/{ => nazi/guard}/fire2.png | Bin assets/{ => nazi/guard}/fire3.png | Bin assets/{ => nazi/guard}/guard1.png | Bin assets/{ => nazi/guard}/guard2.png | Bin assets/{ => nazi/guard}/guard3.png | Bin assets/{ => nazi/guard}/guard4.png | Bin assets/{ => nazi/guard}/guard5.png | Bin assets/{ => pickup}/ammo.png | Bin assets/pickup/biscuits.png | Bin 0 -> 919 bytes assets/{ => pickup}/bkey.png | Bin assets/{ => pickup}/food.png | Bin assets/{ => pickup}/ggun.png | Bin assets/{ => pickup}/gkey.png | Bin assets/{ => pickup}/hpkit.png | Bin assets/{ => pickup}/mgun.png | Bin assets/{ => pickup}/treasure1.png | Bin assets/{ => pickup}/treasure2.png | Bin assets/{ => pickup}/treasure3.png | Bin assets/{ => pickup}/treasure4.png | Bin assets/{ => wall}/bluestone.png | Bin assets/{ => wall}/colorstone.png | Bin assets/{ => wall}/eagle.png | Bin assets/{ => wall}/greystone.png | Bin assets/{ => wall}/mossy.png | Bin assets/{ => wall}/purplestone.png | Bin assets/{ => wall}/redbrick.png | Bin assets/{ => wall}/wood.png | Bin assets/{ => weapon/ggun}/ggun1.png | Bin assets/{ => weapon/ggun}/ggun2.png | Bin assets/{ => weapon/ggun}/ggun3.png | Bin assets/{ => weapon/ggun}/ggun4.png | Bin assets/{ => weapon/ggun}/ggun5.png | Bin assets/{ => weapon/knife}/knife1.png | Bin assets/{ => weapon/knife}/knife2.png | Bin assets/{ => weapon/knife}/knife3.png | Bin assets/{ => weapon/knife}/knife4.png | Bin assets/{ => weapon/knife}/knife5.png | Bin assets/{ => weapon/mgun}/mgun1.png | Bin assets/{ => weapon/mgun}/mgun2.png | Bin assets/{ => weapon/mgun}/mgun3.png | Bin assets/{ => weapon/mgun}/mgun4.png | Bin assets/{ => weapon/mgun}/mgun5.png | Bin assets/{ => weapon/pistol}/gun1.png | Bin assets/{ => weapon/pistol}/gun2.png | Bin assets/{ => weapon/pistol}/gun3.png | Bin assets/{ => weapon/pistol}/gun4.png | Bin assets/{ => weapon/pistol}/gun5.png | Bin cub3d.h | 16 +++------- maps/bigmap.cub | 8 ++--- maps/postestne.cub | 8 ++--- maps/postestnw.cub | 8 ++--- maps/postestse.cub | 8 ++--- maps/postestsw.cub | 8 ++--- maps/smallmap.cub | 8 ++--- maps/spritetest.cub | 8 ++--- maps/treasuretest.cub | 8 ++--- src/draw/texture.c | 10 +++--- src/input/move.c | 26 +--------------- src/main/cleanup.c | 35 +++++++++++++++++---- src/main/init.c | 45 ++++++++++++++++++++------- src/parse/parse.c | 20 ++++++------ src/sprite/draw.c | 14 ++++----- src/sprite/pickup.c | 11 +++++-- 81 files changed, 132 insertions(+), 109 deletions(-) create mode 100644 assets/decoration/armor.png rename assets/{ => decoration}/barrel.png (100%) create mode 100644 assets/decoration/chandel.png create mode 100644 assets/decoration/faucet.png create mode 100644 assets/decoration/gbarrel.png rename assets/{ => decoration}/hlamp.png (100%) create mode 100644 assets/decoration/hskel.png create mode 100644 assets/decoration/pillar.png create mode 100644 assets/decoration/plant.png rename assets/{ => decoration}/slamp.png (100%) create mode 100644 assets/decoration/table.png create mode 100644 assets/decoration/vase.png rename assets/{ => nazi/guard}/die1.png (100%) rename assets/{ => nazi/guard}/die2.png (100%) rename assets/{ => nazi/guard}/die3.png (100%) rename assets/{ => nazi/guard}/die4.png (100%) rename assets/{ => nazi/guard}/die5.png (100%) rename assets/{ => nazi/guard}/fire1.png (100%) rename assets/{ => nazi/guard}/fire2.png (100%) rename assets/{ => nazi/guard}/fire3.png (100%) rename assets/{ => nazi/guard}/guard1.png (100%) rename assets/{ => nazi/guard}/guard2.png (100%) rename assets/{ => nazi/guard}/guard3.png (100%) rename assets/{ => nazi/guard}/guard4.png (100%) rename assets/{ => nazi/guard}/guard5.png (100%) rename assets/{ => pickup}/ammo.png (100%) create mode 100644 assets/pickup/biscuits.png rename assets/{ => pickup}/bkey.png (100%) rename assets/{ => pickup}/food.png (100%) rename assets/{ => pickup}/ggun.png (100%) rename assets/{ => pickup}/gkey.png (100%) rename assets/{ => pickup}/hpkit.png (100%) rename assets/{ => pickup}/mgun.png (100%) rename assets/{ => pickup}/treasure1.png (100%) rename assets/{ => pickup}/treasure2.png (100%) rename assets/{ => pickup}/treasure3.png (100%) rename assets/{ => pickup}/treasure4.png (100%) rename assets/{ => wall}/bluestone.png (100%) rename assets/{ => wall}/colorstone.png (100%) rename assets/{ => wall}/eagle.png (100%) rename assets/{ => wall}/greystone.png (100%) rename assets/{ => wall}/mossy.png (100%) rename assets/{ => wall}/purplestone.png (100%) rename assets/{ => wall}/redbrick.png (100%) rename assets/{ => wall}/wood.png (100%) rename assets/{ => weapon/ggun}/ggun1.png (100%) rename assets/{ => weapon/ggun}/ggun2.png (100%) rename assets/{ => weapon/ggun}/ggun3.png (100%) rename assets/{ => weapon/ggun}/ggun4.png (100%) rename assets/{ => weapon/ggun}/ggun5.png (100%) rename assets/{ => weapon/knife}/knife1.png (100%) rename assets/{ => weapon/knife}/knife2.png (100%) rename assets/{ => weapon/knife}/knife3.png (100%) rename assets/{ => weapon/knife}/knife4.png (100%) rename assets/{ => weapon/knife}/knife5.png (100%) rename assets/{ => weapon/mgun}/mgun1.png (100%) rename assets/{ => weapon/mgun}/mgun2.png (100%) rename assets/{ => weapon/mgun}/mgun3.png (100%) rename assets/{ => weapon/mgun}/mgun4.png (100%) rename assets/{ => weapon/mgun}/mgun5.png (100%) rename assets/{ => weapon/pistol}/gun1.png (100%) rename assets/{ => weapon/pistol}/gun2.png (100%) rename assets/{ => weapon/pistol}/gun3.png (100%) rename assets/{ => weapon/pistol}/gun4.png (100%) rename assets/{ => weapon/pistol}/gun5.png (100%) diff --git a/assets/decoration/armor.png b/assets/decoration/armor.png new file mode 100644 index 0000000000000000000000000000000000000000..c49e546196efa90db6ac3d519fe63a44280fb129 GIT binary patch literal 2774 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 literal 0 HcmV?d00001 diff --git a/assets/barrel.png b/assets/decoration/barrel.png similarity index 100% rename from assets/barrel.png rename to assets/decoration/barrel.png diff --git a/assets/decoration/chandel.png b/assets/decoration/chandel.png new file mode 100644 index 0000000000000000000000000000000000000000..67b75c571a07d30f06b3a664fcc9d74bcace05e8 GIT binary patch literal 1334 zcmb7B`#%$U0R3+Bn0bx7OCjdb&?QYphAod)9x-=XQJ%Y|3^Q8W%%dpRBf36mc|=o$ zPnulC5E8n=r<+%(E$OzrSNmL#>+1do_k2F*oXt3eN;| zKO$DZwcYB5YSR1eg$z|0d(miGWMwrrnrKMo(dlv8a-HhPAYF63uH`bvs{)^+*t?m` zSft6+mN2yhhjbPNuXg*LuXxiF zulu;MLepnQuU25?WzJwk=BiFqQ*hKgb4B+UVxr$}l#*+biATF;0DXFZZ)T=roq;9F zPEaOY%5!8FknLKmLO=eDRkbqhRsTn^{h7n{Q-v4&O_egvQrE*&;ET|@E3uqClSvXe zxDzZWxHlvQ`naqLb2#`bTyIRlrv6Att0H*;xcfW}_srEQ|I1c~E3;qYJMB+ame#kl zHOXjeApAkCR5dORo>OeWoDxqtPql3_`BO9MhJ^TxK(H%k`xS-r$31Xh3HSla(r1{y z?M5lilav5}&E6k`B;RvM+Ab9ny-wg2=al6Ycbe*cNMQf~JK%+L4M?7tzumwPVUfKq zZMs~n5po|g3xUJq@OYe=Xj|n?Ojf$H5ptTHWpO4@4L_O)C$H&8gKBWG0soERxans* zl#jb{iA5o-$B~%vKH=Z&$Rq}mym5Cm4hib=eRd_q4 zB_lQRUTM$0CAj2N$f#>(MGxy1tGg?kV@lDffpV;!oe=}M#m%l_$QOnzX=|1BeE;C& zgd642r>GgVvQh}F!QCkf+-DB448-fkHQ}YjXwMH*Y zcO|iR&kBQXPPPSHWm;#Z3kaVHy5fu>OU}VF9{}$yL6xg0}@Vi993$)}hF43TT zp?>vdD{Uf#xfn~DBXCq^?ZS?lqRARn7mkHfXZAF*#PC0^5h}@?=w%OBKCIxFhXz{{ zX&7i6HVc*HI$EWKWx|?9Ic}*5j~)%+dJ$D>9BALP$zi2?3iEDmDLME1 zNMP7Bkw?XkIGgo6{+uYi`PBTJYWrUsdL~@`GWZahiGjBmmFi`3WpfMMh69f@Gu1}0l|(AQ9)7d zun>dGTsP(l9C~_B(rjr#ALq%&lz;i(Q~qy0d{|f^kjUGgu;cF!f5t6N+$_@=Od43#*1jvuvp#yk&#=>N>YeX@Bl-UPE1R%C#m3~T z`Odm;qQ$1SxMLV!RzG-t<+-@D!*adYnAQ-`BhJyO!(skRRLu{3qlE6x@HxkG1}J0Ab= zDEL`h@R?!Nx`6E3YYKN|7#Qy9h`I`%dHJ!80}|>n$_(3iyfka?*WW(FwvD4Ov%&w$Bopuj09uwM@`ea7xg>JB>S@^sLTa*Yu8S^>g?4pZ&|atF7Pc zI`FlsHla86pKh&_Xwl8oU2~cROV~IR&*k-cYEFE<^F8k)i*E)!hIRRdzL#%RPdz$! z)8%VX^NVMj^iDaDV`jZS{==z>Z@*UMSCz^3yn4ZWAby*p0M{MnL?#9x@O1TaS?83{ F1OR8T;^Y7T literal 0 HcmV?d00001 diff --git a/assets/decoration/gbarrel.png b/assets/decoration/gbarrel.png new file mode 100644 index 0000000000000000000000000000000000000000..011b34fdce1dc854e26660fd548d298f49efc987 GIT binary patch literal 1253 zcmVEX>4Tx04R}tkv&MmKpe$izo=-%!44`88LE?ARK&4Xp$HX1tI2)hr{E zN(#CBst|rfA3_LY7(t1d`kW}H;W@tU;p6LFoM(BT`*ZXw1(N|jfjGf*!y?`wp4qf? z&ilksR+bdvbK(huE=c^yb=l=N&LxNaJTq!!GxNkzVxiQ6*p%PCM#}rkge1Fbm zh4U6?wOVKGd-4}X3fjst*J+L-g+(kuga8?JR8WP5IIS8fCNi|2^ze^3evw=Di&K+sQX~n4UTphg3<&Q6t%hxXAKP~81PD9>S6atkYXY;Mq>R z>G?f^qix@1U>6rkxZ7J>IO`ldWEcnkEdxxKabaryvcsjKu2aBv8W zmneJPoz5RQp-QN!#Omc)(033_}000JJOGiWi@BmQ&DW1DG$p8QV32;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Ri3k3%n6euHjng9R-<4Ht8RCwC$n=M!4Koo`__C!WR ztf;7{sHj9B5y*-aDKCYdyo`^^1#`*n29f00h7xG^fp*j~|14k%x^5wQ=mOhWdDY>V7Z> zAl|yk9s^i2{LUEMF@|=`Mcvg{cPtPE3=jVBn;A3CIj66W8BT{>jVFyh>rvCc5ErhnS8aBMx0`a(%iALp*@;}d3K4&xLY14BQ9 zlK}%DGrPUC`XVe^gwl8!yw?%F@0aoIkfVkW259gakdXUSQ{e*zC3fqKzETk|#7D0x_gxy%ecs0y?SfDZUxUIoG|L>mCbqBaP5Hz)wU2!Kr?R2hGVAcTr`a6)MIYgV2T zAtXYmLIjBr5+NiyKy-lU0MP-W1M2F4pWpq;wLQ<_ z!<&j*s}j6rJV25pBuRo&iZo48N|9wb>B1Y@%>k1D1~C7Tf3thdsv?Ah`EDltr*!LD%F^n#-{|2}_l8>|^Xx+CGK8i^6mi+V;Eu3z+3#smBZR>qYmK2U1M P00000NkvXXu0mjfW&09) literal 0 HcmV?d00001 diff --git a/assets/hlamp.png b/assets/decoration/hlamp.png similarity index 100% rename from assets/hlamp.png rename to assets/decoration/hlamp.png diff --git a/assets/decoration/hskel.png b/assets/decoration/hskel.png new file mode 100644 index 0000000000000000000000000000000000000000..e20e6a4e0b96d1fa207b5a9fe507e69fde440576 GIT binary patch literal 1795 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 A{Qv*} literal 0 HcmV?d00001 diff --git a/assets/slamp.png b/assets/decoration/slamp.png similarity index 100% rename from assets/slamp.png rename to assets/decoration/slamp.png diff --git a/assets/decoration/table.png b/assets/decoration/table.png new file mode 100644 index 0000000000000000000000000000000000000000..841a25238a8beb63a584e61b138339fb5185d279 GIT binary patch literal 1689 zcmV;K24?w*P)EX>4Tx04R}tkv&MmKpe$izo=-%!44`88LE?ARK&4Xp$HX1tI2)hr{E zN(#CBst|rfA3_LY7(t1d`kW}H;W@tU;p6LFoM(BT`*ZXw1(N|jfjGf*!y?`wp4qf? z&ilksR+bdvbK(huE=c^yb=l=N&LxNaJTq!!GxNkzVxiQ6*p%PCM#}rkge1Fbm zh4U6?wOVKGd-4}X3fjst*J+L-g+(kuga8?JR8WP5IIS8fCNi|2^ze^3evw=Di&K+sQX~n4UTphg3<&Q6t%hxXAKP~81PD9>S6atkYXY;Mq>R z>G?f^qix@1U>6rkxZ7J>IO`ldWEcnkEdxxKabaryvcsjKu2aBv8W zmneJPoz5RQp-QN!#Omc)(033_}000JJOGiWi@BmQ&DW1DG$p8QV32;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Ri3k3%nAPJX@F8}}pmq|oHRCwC$n;~%GOccj|y@`m3 zh(JU{AP^OZ3IyUr#R&wW0#Q+cKvqK7GPq zv-uya`!~7fxyQhtdqBtYz%D00f2#Qpgc2S@5dH3UJs^~T^da!)@wP7*!p|h(P;Q=( zHwJM3J0V(Yd-I2d{z^sIRRYbkfpGcpc)r^lFzR*Rgvq{aF+oq8JwR^X1B%oEE0yAv z-5&j->R3$0e6m8u0JJARmtHe%_V9(IY`@aFX7B6O0jJ{&rp+GJQc?!_LSorQVb}fi zN^lo-K;^#8@Eex>(o%RMcoG zkYyGKxqS~XKTzS{TmZ^?7y=4?cH0)rh8W>G)V=&)}dcdx%WSIb%<`-6huWTB?s*^9B z-p}66y}KS+2qU9?_wj~Et?jKWa=O!kDzK0|GfHy#h>T+-;B2r0Q zoz)JpOq1s@;wg-Pw{kH2{yXtVN-LiSEy_$*oCn*ssr_5o%mV=Kd=nOK&a5wgJ2hsv zDI&`+oo#$C=|7FsV$MCZ>^0a};DNq#$_P0X0pPjt%1F+B)h? zQwT>Os6l^i*agX_BKGZ#JJVB24wHrjUtLh|58R2?f__{2zJQ%ada{O8zC zL8&+<5R&`n_{}{JojHU+C|uh_#WDTI^*!)c}*5j~)%+dJ$D>9BALP$zi2?3iEDmDLME1 zNMP7Bkw?XkIGgo6{+uYi`PBTJYWrUslYnz5NWrU zNO4JVbzu>T>|C+p0fQ}56SIQ0fT*YpL*t4SF9fv&1W(8P63uBjk`uorC=b1YfwlZ?>xP2y~;p_@N%LApK;wsa7!nen> z3BR7dsb<}g%F~JyQfrO>NpBbMnqnT$%u*Lp&#*AD@bWKfh1I^_)^B8=aqa%}9g>O( zQT91Wd>K#HA6%uY%fCYCz{e%({44Am{%7T!dBVt4@S9=XMv-a3tW9mz4*zqbHi#TM z7T7%PhUt1?uk21y{^lKaiW_*F7i4g_i05}tmt(phjp9?9~)vzW=4_y}SMKO>0CZtl3#yp!KogFl*og zW|dRR_db~MsZ!MbDeqb>x%u)>Z+wv8>ke<+lb3%=zE7m*|753(kH93r;OXk;vd$@? F2>=Bfnx_B& literal 0 HcmV?d00001 diff --git a/assets/die1.png b/assets/nazi/guard/die1.png similarity index 100% rename from assets/die1.png rename to assets/nazi/guard/die1.png diff --git a/assets/die2.png b/assets/nazi/guard/die2.png similarity index 100% rename from assets/die2.png rename to assets/nazi/guard/die2.png diff --git a/assets/die3.png b/assets/nazi/guard/die3.png similarity index 100% rename from assets/die3.png rename to assets/nazi/guard/die3.png diff --git a/assets/die4.png b/assets/nazi/guard/die4.png similarity index 100% rename from assets/die4.png rename to assets/nazi/guard/die4.png diff --git a/assets/die5.png b/assets/nazi/guard/die5.png similarity index 100% rename from assets/die5.png rename to assets/nazi/guard/die5.png diff --git a/assets/fire1.png b/assets/nazi/guard/fire1.png similarity index 100% rename from assets/fire1.png rename to assets/nazi/guard/fire1.png diff --git a/assets/fire2.png b/assets/nazi/guard/fire2.png similarity index 100% rename from assets/fire2.png rename to assets/nazi/guard/fire2.png diff --git a/assets/fire3.png b/assets/nazi/guard/fire3.png similarity index 100% rename from assets/fire3.png rename to assets/nazi/guard/fire3.png diff --git a/assets/guard1.png b/assets/nazi/guard/guard1.png similarity index 100% rename from assets/guard1.png rename to assets/nazi/guard/guard1.png diff --git a/assets/guard2.png b/assets/nazi/guard/guard2.png similarity index 100% rename from assets/guard2.png rename to assets/nazi/guard/guard2.png diff --git a/assets/guard3.png b/assets/nazi/guard/guard3.png similarity index 100% rename from assets/guard3.png rename to assets/nazi/guard/guard3.png diff --git a/assets/guard4.png b/assets/nazi/guard/guard4.png similarity index 100% rename from assets/guard4.png rename to assets/nazi/guard/guard4.png diff --git a/assets/guard5.png b/assets/nazi/guard/guard5.png similarity index 100% rename from assets/guard5.png rename to assets/nazi/guard/guard5.png diff --git a/assets/ammo.png b/assets/pickup/ammo.png similarity index 100% rename from assets/ammo.png rename to assets/pickup/ammo.png diff --git a/assets/pickup/biscuits.png b/assets/pickup/biscuits.png new file mode 100644 index 0000000000000000000000000000000000000000..819ba76a6c411c73b952e93609fcd227afa0517a GIT binary patch literal 919 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~JBGb`J1#c2+1T%1_J8No8Qr zm{>c}*5j~)%+dJ$D>9BALP$zi2?3iEDmDLME1 zNMP7Bkw?XkIGgo6{+uYi`PBTJYWrUsChPZ!6Kid%1QD+V7nkT~|y zUWUm~&@eEt(IF&6NkEw6hze7u!xv?R9}FBU@(GKC8XbHT1UkHqxVXBy9CdMVIjXIt zwu9NVk^g|pcN?|oyPs73RLx(tY5RkJlV#7@S<5kUI502?G%&CzFi^xiFr#S0T7J=` z>UJp2w_0^A!hNyE!p*$p`PxC|4}UFO_Ohq>r|!Qu zwKl2&HFtQr>oc$Eyq;!NR#Ec>naxucqA0VQZNA z@RjP-+r|uUFS15X<4sOa^t@Uzt +#+ */ /* +#+ */ /* Created: 2023/10/26 10:46:35 by houtworm #+# #+# */ -/* Updated: 2023/11/05 08:05:51 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 08:22:47 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -37,16 +37,10 @@ typedef struct s_varlist mlx_image_t *tstat; mlx_image_t *kstat; mlx_texture_t *temptext; - mlx_texture_t *northtext; - mlx_texture_t *easttext; - mlx_texture_t *southtext; - mlx_texture_t *westtext; - mlx_texture_t *barreltext; - mlx_texture_t *hlamptext; - mlx_texture_t *slamptext; - mlx_texture_t *treasuretext; - mlx_texture_t *endtext; - mlx_texture_t *nazitext; + mlx_texture_t **walltext; + mlx_texture_t **decotext; + mlx_texture_t **picktext; + mlx_texture_t **nazitext; t_sprite *sprite; int spritecount; int w; diff --git a/maps/bigmap.cub b/maps/bigmap.cub index a99741c..0144f7f 100644 --- a/maps/bigmap.cub +++ b/maps/bigmap.cub @@ -1,10 +1,10 @@ C 50,50,50 F 100,100,100 -NO ./assets/bluestone.png -EA ./assets/colorstone.png -SO ./assets/redbrick.png -WE ./assets/wood.png +NO ./assets/wall/bluestone.png +EA ./assets/wall/colorstone.png +SO ./assets/wall/redbrick.png +WE ./assets/wall/wood.png 1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 1G B1 1 1 1 1 1 diff --git a/maps/postestne.cub b/maps/postestne.cub index 21643bb..a080ebb 100644 --- a/maps/postestne.cub +++ b/maps/postestne.cub @@ -1,10 +1,10 @@ C 0,100,255 F 100,100,100 -NO ./assets/bluestone.png -EA ./assets/colorstone.png -SO ./assets/redbrick.png -WE ./assets/wood.png +NO ./assets/wall/bluestone.png +EA ./assets/wall/colorstone.png +SO ./assets/wall/redbrick.png +WE ./assets/wall/wood.png 1111111 1 N1 diff --git a/maps/postestnw.cub b/maps/postestnw.cub index f8fdf8e..6833b4e 100644 --- a/maps/postestnw.cub +++ b/maps/postestnw.cub @@ -1,10 +1,10 @@ C 0,100,255 F 100,100,100 -NO ./assets/bluestone.png -EA ./assets/colorstone.png -SO ./assets/redbrick.png -WE ./assets/wood.png +NO ./assets/wall/bluestone.png +EA ./assets/wall/colorstone.png +SO ./assets/wall/redbrick.png +WE ./assets/wall/wood.png 1111111 1N 1 diff --git a/maps/postestse.cub b/maps/postestse.cub index b958d86..291dc6d 100644 --- a/maps/postestse.cub +++ b/maps/postestse.cub @@ -1,10 +1,10 @@ C 0,100,255 F 100,100,100 -NO ./assets/bluestone.png -EA ./assets/colorstone.png -SO ./assets/redbrick.png -WE ./assets/wood.png +NO ./assets/wall/bluestone.png +EA ./assets/wall/colorstone.png +SO ./assets/wall/redbrick.png +WE ./assets/wall/wood.png 1111111 1 1 diff --git a/maps/postestsw.cub b/maps/postestsw.cub index 7fcb121..a94ad7b 100644 --- a/maps/postestsw.cub +++ b/maps/postestsw.cub @@ -1,10 +1,10 @@ C 0,100,255 F 100,100,100 -NO ./assets/bluestone.png -EA ./assets/colorstone.png -SO ./assets/redbrick.png -WE ./assets/wood.png +NO ./assets/wall/bluestone.png +EA ./assets/wall/colorstone.png +SO ./assets/wall/redbrick.png +WE ./assets/wall/wood.png 1111111 1 1 diff --git a/maps/smallmap.cub b/maps/smallmap.cub index 1929d58..5d983e4 100644 --- a/maps/smallmap.cub +++ b/maps/smallmap.cub @@ -1,10 +1,10 @@ C 0,100,255 F 100,100,100 -NO ./assets/bluestone.png -EA ./assets/colorstone.png -SO ./assets/redbrick.png -WE ./assets/wood.png +NO ./assets/wall/bluestone.png +EA ./assets/wall/colorstone.png +SO ./assets/wall/redbrick.png +WE ./assets/wall/wood.png 111111111111111111111111 1 B1 diff --git a/maps/spritetest.cub b/maps/spritetest.cub index 5109b9b..b7620a9 100644 --- a/maps/spritetest.cub +++ b/maps/spritetest.cub @@ -1,10 +1,10 @@ C 0,100,255 F 100,100,100 -NO ./assets/bluestone.png -EA ./assets/colorstone.png -SO ./assets/redbrick.png -WE ./assets/wood.png +NO ./assets/wall/bluestone.png +EA ./assets/wall/colorstone.png +SO ./assets/wall/redbrick.png +WE ./assets/wall/wood.png 1111111 1B1B1B1 diff --git a/maps/treasuretest.cub b/maps/treasuretest.cub index 10c0a49..a385bb3 100644 --- a/maps/treasuretest.cub +++ b/maps/treasuretest.cub @@ -1,10 +1,10 @@ C 0,100,255 F 100,100,100 -NO ./assets/bluestone.png -EA ./assets/colorstone.png -SO ./assets/redbrick.png -WE ./assets/wood.png +NO ./assets/wall/bluestone.png +EA ./assets/wall/colorstone.png +SO ./assets/wall/redbrick.png +WE ./assets/wall/wood.png 1111111 1CCCCC1 diff --git a/src/draw/texture.c b/src/draw/texture.c index f9d5e6e..009bc3a 100644 --- a/src/draw/texture.c +++ b/src/draw/texture.c @@ -6,7 +6,7 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:54:20 by houtworm #+# #+# */ -/* Updated: 2023/11/05 08:06:21 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 08:17:39 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -17,16 +17,16 @@ void ft_selecttexture(t_varlist *vl) if (vl->side == 0) { if (vl->raydirx > 0) - vl->temptext = vl->northtext; + vl->temptext = vl->walltext[0]; else - vl->temptext = vl->southtext; + vl->temptext = vl->walltext[2]; } else { if (vl->raydiry > 0) - vl->temptext = vl->westtext; + vl->temptext = vl->walltext[3]; else - vl->temptext = vl->easttext; + vl->temptext = vl->walltext[1]; } } diff --git a/src/input/move.c b/src/input/move.c index cd97feb..7bc914d 100644 --- a/src/input/move.c +++ b/src/input/move.c @@ -6,7 +6,7 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:50:23 by houtworm #+# #+# */ -/* Updated: 2023/11/05 05:47:25 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 09:05:31 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -21,15 +21,9 @@ void ft_moveforward(t_varlist *vl, double movespeed) else distance = vl->sidedistx - vl->deltadistx; if (vl->map[(int)(vl->posx + vl->dirx * movespeed)][(int)vl->posy] == '0' && distance > 0.4) - { vl->posx += vl->dirx * movespeed * vl->run; - vl->posy += vl->diry * movespeed * vl->run; - } if (vl->map[(int)vl->posx][(int)(vl->posy + vl->diry * movespeed)] == '0' && distance > 0.4) - { - vl->posx += vl->dirx * movespeed * vl->run; vl->posy += vl->diry * movespeed * vl->run; - } } void ft_movebackward(t_varlist *vl, double movespeed) @@ -41,15 +35,9 @@ void ft_movebackward(t_varlist *vl, double movespeed) else distance = vl->sidedistx - vl->deltadistx; if (vl->map[(int)(vl->posx - vl->dirx * movespeed)][(int)vl->posy] == '0' && distance > 0.4) - { vl->posx -= vl->dirx * movespeed * vl->run; - vl->posy -= vl->diry * movespeed * vl->run; - } if (vl->map[(int)vl->posx][(int)(vl->posy - vl->diry * movespeed)] == '0' && distance > 0.4) - { - vl->posx -= vl->dirx * movespeed * vl->run; vl->posy -= vl->diry * movespeed * vl->run; - } } void ft_moveleft(t_varlist *vl, double movespeed) @@ -61,15 +49,9 @@ void ft_moveleft(t_varlist *vl, double movespeed) else distance = vl->sidedistx - vl->deltadistx; if (vl->map[(int)(vl->posx - vl->dirx * movespeed)][(int)vl->posy] == '0' && distance > 0.4) - { vl->posx -= vl->diry * movespeed * vl->run; - vl->posy += vl->dirx * movespeed * vl->run; - } if (vl->map[(int)vl->posx][(int)(vl->posy - vl->diry * movespeed)] == '0' && distance > 0.4) - { - vl->posx -= vl->diry * movespeed * vl->run; vl->posy += vl->dirx * movespeed * vl->run; - } } void ft_moveright(t_varlist *vl, double movespeed) @@ -81,15 +63,9 @@ void ft_moveright(t_varlist *vl, double movespeed) else distance = vl->sidedistx - vl->deltadistx; if (vl->map[(int)(vl->posx + vl->dirx * movespeed)][(int)vl->posy] == '0' && distance > 0.4) - { vl->posx += vl->diry * movespeed * vl->run; - vl->posy -= vl->dirx * movespeed * vl->run; - } if (vl->map[(int)vl->posx][(int)(vl->posy + vl->diry * movespeed)] == '0' && distance > 0.4) - { - vl->posx += vl->diry * movespeed * vl->run; vl->posy -= vl->dirx * movespeed * vl->run; - } } void ft_processmove(t_varlist *vl, double movespeed) diff --git a/src/main/cleanup.c b/src/main/cleanup.c index f5340ad..a7636c3 100644 --- a/src/main/cleanup.c +++ b/src/main/cleanup.c @@ -6,7 +6,7 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 14:13:07 by houtworm #+# #+# */ -/* Updated: 2023/11/05 07:56:34 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 08:40:06 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -14,10 +14,33 @@ void ft_cleanup(t_varlist *vl) { - mlx_delete_texture(vl->northtext); - mlx_delete_texture(vl->easttext); - mlx_delete_texture(vl->southtext); - mlx_delete_texture(vl->westtext); - mlx_delete_texture(vl->barreltext); + mlx_delete_texture(vl->walltext[0]); + mlx_delete_texture(vl->walltext[1]); + mlx_delete_texture(vl->walltext[2]); + mlx_delete_texture(vl->walltext[3]); + mlx_delete_texture(vl->decotext[0]); + mlx_delete_texture(vl->decotext[1]); + mlx_delete_texture(vl->decotext[2]); + mlx_delete_texture(vl->decotext[3]); + mlx_delete_texture(vl->decotext[4]); + mlx_delete_texture(vl->decotext[5]); + mlx_delete_texture(vl->decotext[6]); + mlx_delete_texture(vl->decotext[7]); + mlx_delete_texture(vl->decotext[8]); + mlx_delete_texture(vl->decotext[9]); + mlx_delete_texture(vl->decotext[10]); + mlx_delete_texture(vl->decotext[11]); + mlx_delete_texture(vl->picktext[0]); + mlx_delete_texture(vl->picktext[1]); + mlx_delete_texture(vl->picktext[2]); + mlx_delete_texture(vl->picktext[3]); + mlx_delete_texture(vl->picktext[4]); + mlx_delete_texture(vl->picktext[5]); + mlx_delete_texture(vl->picktext[6]); + mlx_delete_texture(vl->picktext[7]); + mlx_delete_texture(vl->picktext[8]); + mlx_delete_texture(vl->picktext[9]); + mlx_delete_texture(vl->picktext[10]); + mlx_delete_texture(vl->picktext[11]); mlx_delete_image(vl->mlx, vl->img); } diff --git a/src/main/init.c b/src/main/init.c index c215b06..5823596 100644 --- a/src/main/init.c +++ b/src/main/init.c @@ -6,7 +6,7 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:49:12 by houtworm #+# #+# */ -/* Updated: 2023/11/05 07:51:11 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 08:59:03 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -14,20 +14,42 @@ void ft_initsprites(t_varlist *vl) { - vl->barreltext = mlx_load_png("./assets/barrel.png"); - vl->hlamptext = mlx_load_png("./assets/hlamp.png"); - vl->slamptext = mlx_load_png("./assets/slamp.png"); - vl->endtext = mlx_load_png("./assets/bkey.png"); + vl->decotext = ft_calloc(4096, 8); + vl->decotext[0] = mlx_load_png("./assets/decoration/barrel.png"); + vl->decotext[1] = mlx_load_png("./assets/decoration/gbarrel.png"); + vl->decotext[2] = mlx_load_png("./assets/decoration/slamp.png"); + vl->decotext[3] = mlx_load_png("./assets/decoration/armor.png"); + vl->decotext[4] = mlx_load_png("./assets/decoration/pillar.png"); + vl->decotext[5] = mlx_load_png("./assets/decoration/plant.png"); + vl->decotext[6] = mlx_load_png("./assets/decoration/vase.png"); + vl->decotext[7] = mlx_load_png("./assets/decoration/faucet.png"); + vl->decotext[8] = mlx_load_png("./assets/decoration/table.png"); + vl->decotext[9] = mlx_load_png("./assets/decoration/hskel.png"); + vl->decotext[10] = mlx_load_png("./assets/decoration/hlamp.png"); + vl->decotext[11] = mlx_load_png("./assets/decoration/chandel.png"); } void ft_initpickups(t_varlist *vl) { - vl->treasuretext = mlx_load_png("./assets/treasure3.png"); + vl->picktext = ft_calloc(4096, 8); + vl->picktext[0] = mlx_load_png("./assets/pickup/treasure1.png"); + vl->picktext[1] = mlx_load_png("./assets/pickup/treasure2.png"); + vl->picktext[2] = mlx_load_png("./assets/pickup/treasure3.png"); + vl->picktext[3] = mlx_load_png("./assets/pickup/treasure4.png"); + vl->picktext[4] = mlx_load_png("./assets/pickup/hpkit.png"); + vl->picktext[5] = mlx_load_png("./assets/pickup/food.png"); + vl->picktext[6] = mlx_load_png("./assets/pickup/biscuits.png"); + vl->picktext[7] = mlx_load_png("./assets/pickup/gkey.png"); + vl->picktext[8] = mlx_load_png("./assets/pickup/bkey.png"); + vl->picktext[9] = mlx_load_png("./assets/pickup/mgun.png"); + vl->picktext[10] = mlx_load_png("./assets/pickup/ggun.png"); + vl->picktext[11] = mlx_load_png("./assets/pickup/ammo.png"); } void ft_initenemies(t_varlist *vl) { - vl->nazitext = mlx_load_png("./assets/guard1.png"); + vl->nazitext = ft_calloc(4096, 8); + vl->nazitext[0] = mlx_load_png("./assets/nazi/guard/guard1.png"); } void ft_initmainstuff(t_varlist *vl) @@ -36,6 +58,7 @@ void ft_initmainstuff(t_varlist *vl) vl->h = 600; vl->sprite = ft_calloc(4096, 8); vl->distance = ft_calloc(4096, 8); + vl->walltext = ft_calloc(4096, 8); vl->spritecount = 0; vl->vaim = 0; vl->jump = 0; @@ -47,10 +70,10 @@ void ft_initmainstuff(t_varlist *vl) vl->ggun = 0; vl->ccolor = 0; vl->fcolor = 0; - vl->northtext = NULL; - vl->easttext = NULL; - vl->southtext = NULL; - vl->westtext = NULL; + vl->walltext[0] = NULL; + vl->walltext[1] = NULL; + vl->walltext[2] = NULL; + vl->walltext[3] = NULL; } t_varlist initgame(void) diff --git a/src/parse/parse.c b/src/parse/parse.c index 73e63ca..bf25a7d 100644 --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -6,7 +6,7 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:48:55 by houtworm #+# #+# */ -/* Updated: 2023/11/05 07:33:11 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 08:19:52 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -20,13 +20,13 @@ int ft_settexture(t_varlist *vl, char *line, int direction) while (line[i] != '.') i++; if (direction == 1) - vl->northtext = mlx_load_png(&line[i]); + vl->walltext[0] = mlx_load_png(&line[i]); if (direction == 2) - vl->easttext = mlx_load_png(&line[i]); + vl->walltext[1] = mlx_load_png(&line[i]); if (direction == 3) - vl->southtext = mlx_load_png(&line[i]); + vl->walltext[2] = mlx_load_png(&line[i]); if (direction == 4) - vl->westtext = mlx_load_png(&line[i]); + vl->walltext[3] = mlx_load_png(&line[i]); return (0); } @@ -76,7 +76,7 @@ char *ft_checkline(t_varlist *vl, char *line) } else if (!ft_strncmp(line, "NO ", 3)) { - if (!vl->northtext) + if (!vl->walltext[0]) ft_settexture(vl, line, 1); else return (" north texture"); @@ -88,21 +88,21 @@ char *ft_checkline2(t_varlist *vl, char *line) { if (!ft_strncmp(line, "EA ", 3)) { - if (!vl->easttext) + if (!vl->walltext[1]) ft_settexture(vl, line, 2); else return (" east texture"); } else if (!ft_strncmp(line, "SO ", 3)) { - if (!vl->southtext) + if (!vl->walltext[2]) ft_settexture(vl, line, 3); else return (" south texture"); } else if (!ft_strncmp(line, "WE ", 3)) { - if (!vl->westtext) + if (!vl->walltext[3]) ft_settexture(vl, line, 4); else return (" west texture"); @@ -126,7 +126,7 @@ t_varlist ft_parseconfigfile(t_varlist vl, char *filename) error = ft_checkline2(&vl, line); if (error) ft_errorexit("Double config declaration in .cub file", error, 1); - if (vl.ccolor && vl.fcolor && vl.northtext && vl.easttext && vl.southtext && vl.westtext) + if (vl.ccolor && vl.fcolor && vl.walltext[0] && vl.walltext[1] && vl.walltext[2] && vl.walltext[3]) { vl.map = ft_getmap(&vl, fd); break ; diff --git a/src/sprite/draw.c b/src/sprite/draw.c index 12ca69e..9bb0d37 100644 --- a/src/sprite/draw.c +++ b/src/sprite/draw.c @@ -6,7 +6,7 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:54:20 by houtworm #+# #+# */ -/* Updated: 2023/11/05 08:06:48 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 08:44:20 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -17,17 +17,17 @@ mlx_texture_t *ft_selectsprite(t_varlist *vl, int type) mlx_texture_t *sprite; if (type == 1) - sprite = vl->barreltext; + sprite = vl->decotext[0]; else if (type == 2) - sprite = vl->slamptext; + sprite = vl->decotext[2]; else if (type == 3) - sprite = vl->hlamptext; + sprite = vl->decotext[10]; else if (type == 4) - sprite = vl->treasuretext; + sprite = vl->picktext[0]; else if (type == 5) - sprite = vl->endtext; + sprite = vl->picktext[1]; else if (type == 6) - sprite = vl->nazitext; + sprite = vl->nazitext[0]; else ft_errorexit("what?", "what?", 1); return (sprite); diff --git a/src/sprite/pickup.c b/src/sprite/pickup.c index 5f8c56a..25c39f3 100644 --- a/src/sprite/pickup.c +++ b/src/sprite/pickup.c @@ -6,13 +6,13 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 14:13:07 by houtworm #+# #+# */ -/* Updated: 2023/11/05 07:54:44 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 08:20:00 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ #include "../../cub3d.h" -void ft_pickup(t_varlist *vl) +void ft_pickuptreasure(t_varlist *vl) { int i; @@ -38,3 +38,10 @@ void ft_pickup(t_varlist *vl) i++; } } + +void ft_pickup(t_varlist *vl) +{ + ft_pickuptreasure(vl); + /*ft_pickuphealth(vl);*/ + /*ft_pickupweapon(vl);*/ +}