frzysk/42_so_long
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change, fix, .gitignore *

Browse source 
fix: warning gnu old-style field designator ext.
change: inner walls texture
dev: add *.o and *.a to .gitignore
This commit is contained in:
mcolonna 2024-04-22 12:46:58 +02:00
parent 960f13d9db
commit 42706ab8cc
17 changed files with 500 additions and 479 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +1,4 @@
so_long
mlx/test/mlx-test
*.o
*.a

478
assets/wall/inner.alpha.xpm
View file

@ -1,238 +1,250 @@
/* XPM */
static char *inner_alpha[] = {
/* columns rows colors chars-per-pixel */
"150 150 82 1 ",
" c black",
". c #0B0B0B",
"X c #161616",
"o c #202020",
"O c #2C2C2C",
"+ c #323232",
"@ c #343434",
"# c #3E3E3E",
"$ c #3F3F3F",
"% c #434343",
"& c #494949",
"* c gray31",
"= c gray32",
"- c #585858",
"; c #656565",
": c #6C6C6C",
"> c gray43",
", c #6F6F6F",
"< c gray44",
"1 c #727272",
"2 c #747474",
"3 c gray46",
"4 c #7B7B7B",
"5 c #7C7C7C",
"6 c #7E7E7E",
"7 c gray52",
"8 c #888888",
"9 c gray54",
"0 c #8B8B8B",
"q c #959595",
"w c gray59",
"e c #979797",
"r c #989898",
"t c gray65",
"y c gray67",
"u c #AEAEAE",
"i c gray69",
"p c gray70",
"a c #B4B4B4",
"s c #B6B6B6",
"d c #B7B7B7",
"f c gray73",
"g c #BBBBBB",
"h c #BCBCBC",
"j c gray74",
"k c gray",
"l c gray75",
"z c gray76",
"x c #CACACA",
"c c #CBCBCB",
"v c gray81",
"b c #D0D0D0",
"n c gray85",
"m c #DADADA",
"M c gainsboro",
"N c #DDDDDD",
"B c #DFDFDF",
"V c gray88",
"C c #E6E6E6",
"Z c gray91",
"A c #E9E9E9",
"S c #EAEAEA",
"D c #ECECEC",
"F c gray93",
"G c #EEEEEE",
"H c #EFEFEF",
"J c gray94",
"K c #F1F1F1",
"L c gray95",
"P c #F3F3F3",
"I c #F4F4F4",
"U c gray96",
"Y c #F6F6F6",
"T c gray97",
"R c #F8F8F8",
"E c #F9F9F9",
"W c gray98",
"Q c #FBFBFB",
"! c gray99",
"~ c #FDFDFD",
"^ c #FEFEFE",
"/ c white",
"150 150 94 2 ",
" c black",
". c #0B0B0B",
"X c #0C0C0C",
"o c #151515",
"O c #161616",
"+ c gray13",
"@ c #222222",
"# c #2A2A2A",
"$ c gray17",
"% c #2C2C2C",
"& c #323232",
"* c #343434",
"= c #353535",
"- c #3E3E3E",
"; c gray28",
": c #4C4C4C",
"> c gray31",
", c #505050",
"< c gray34",
"1 c #5A5A5A",
"2 c gray37",
"3 c gray39",
"4 c #656565",
"5 c gray43",
"6 c #747474",
"7 c #767676",
"8 c #777777",
"9 c #7B7B7B",
"0 c gray50",
"q c gray51",
"w c #868686",
"e c #888888",
"r c #8B8B8B",
"t c #8E8E8E",
"y c #979797",
"u c gray60",
"i c #9B9B9B",
"p c #A2A2A2",
"a c gray64",
"s c #A5A5A5",
"d c #A7A7A7",
"f c #A9A9A9",
"g c gray67",
"h c #AFAFAF",
"j c gray70",
"k c gray72",
"l c #B9B9B9",
"z c #BCBCBC",
"x c gray74",
"c c #C0C0C0",
"v c #C1C1C1",
"b c gray76",
"n c gray77",
"m c #C6C6C6",
"M c gray78",
"N c #CACACA",
"B c #CBCBCB",
"V c gray80",
"C c gray81",
"Z c #D0D0D0",
"A c #D2D2D2",
"S c #D5D5D5",
"D c gray84",
"F c #D7D7D7",
"G c #D8D8D8",
"H c gray85",
"J c #DADADA",
"K c #DDDDDD",
"L c gray87",
"P c #DFDFDF",
"I c gray88",
"U c gray90",
"Y c #E9E9E9",
"T c #EAEAEA",
"R c gray92",
"E c #ECECEC",
"W c gray93",
"Q c #EEEEEE",
"! c #EFEFEF",
"~ c #F1F1F1",
"^ c gray95",
"/ c #F3F3F3",
"( c #F4F4F4",
") c gray96",
"_ c #F6F6F6",
"` c gray97",
"' c #F8F8F8",
"] c #F9F9F9",
"[ c gray98",
"{ c #FBFBFB",
"} c gray99",
"| c #FDFDFD",
" . c #FEFEFE",
".. c white",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" @emNveX X<yu0+ @emNveo X<yu0+ ",
" hUEEEEA5.ONUUUUA< hUEEEEA5.ONUUUEA3 ",
" AED////PhA////E/P* AEDE///UhA////EEU= ",
" VE//////EE/////UEe N///////EE/////EEe ",
" dE//////E///////U0 fE/////////////EU0 ",
" =P/////////////EU$ =P//////////////U$ ",
" 7EE////////////h 7U////////////Eh ",
" v/E/////////UhX bEE/////////EzX ",
" %NE////////A7. $NE////////A5. ",
" >U///////CO >U/////E/CO ",
" 5U/////DUp 4U/////DPp ",
" eU/////AUp eU/////AUp ",
" uU/////AUp uU/////AUp ",
" fE/////DUp dU/////DUd ",
" uE/////EUp pE/////EUp ",
" eE/////EUp rE//////Up ",
" <U//////Up 3U/////EUp ",
" >E/////EUp >E/////EUp ",
" 3EE////EUf 3E/////EEf ",
" >E/////UUp >U/////UUp ",
" >U/////UUp <U/////UUp ",
" >U/////UUd >U/////UUd ",
" <U/////UPp >U/////PUp ",
" >U/////PUp >U/////PPd ",
" <U/////AUy >U/////DPu ",
" >U/////PUe >U/////PUe ",
" <U/////EP> >U/////EU> ",
" <E/////EP: 3E//////P: ",
" >U//////P: >U//////P> ",
" >U/////EP; >U//////P; ",
" &U//////U$ &U/////EP$ ",
" .E/////EP. .E/////EP. ",
" E/////EU E/////EU ",
" E//////U E//////U ",
" E////E/U E/////EP ",
" E//////P E//////P ",
" E//////U E//////U ",
" E//////P U//////P ",
" U//////U U//////P ",
" U//////P E//////P ",
" $P//////U $P//////U ",
" >EE/////U >E//////P ",
" >U//////U >U//////U ",
" >P//////P >P//////P ",
" >U//////U >P//////U ",
" 7U//////U 0P//////P ",
" uU//////U uP//////P ",
" pP//////U pP//////U ",
" dU//////U dP//////U ",
" hU//////P fU//////U ",
" hU//////U hU//////U ",
" mU//////U mU//////U ",
" NU//////U VU//////U ",
" VE//////U VE//////P ",
" NE//////U VE//////U ",
" VEE/////P VEE////EP ",
" N//////EP NE//////P ",
" d//////Ec dE/////Ec ",
" %thcNNhe- %tzcNNhe- ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" O > 2 $ O > 2 $ O , 2 $ ",
" % I ' } ` x O % I } ' ` x O % I } ' ` x O ",
" g ' } } } } b . g } } } } } b . g ' } } } } b X ",
" E } } } } } } 4 O 3 p q O Y } } } } } } 4 O 4 p 0 O E } } } } } } 4 O 4 p q O ",
" ` } } } } } } ` ' } } } U % ` } } } } } } ` ' } } } U $ / } } } } } } ' ' } } } U $ ",
" I } } } } } } } } } } } } I % I } } } } } } } } } } } } L $ I } } } } } } } } } } } } L $ ",
" b } } } } } } } } } } } } } i b } } } } } } } } } } } } ' i b } } } } } } } } } } } } ' i ",
" t } } } } } } } } } } } } ` j t } } } } } } } } } } } } ` j y ' } } } } } } } } } } } ' j ",
" @ ' } } } } } } } } } } } ' q @ } } } } } } } } } } } } ` q @ ' } } } } } } } } } } } ` q ",
" ' } } } } } } } } } } } L % ' } } } } } } } } } } } L % ' } } } } } } } } } } } L % ",
" ; } } } } } } } } } } ` x O - } } } } } } } } } } ` x O - } } } } } } } } } } ' x O ",
" g } } } } } } } } } N 1 g } } } } } } } } } N 1 g } } } } } } } } ' N 1 ",
" Y } } } } } } } } s U } } } } } } } } s Y } } } } } } } } s ",
" * ` } } } } } } } / & * ' } } } } } } } ` & * ' } } } } } } } / & ",
" i ' } } } } } } } k i ' } } } } } } } k i } } } } } } } } k ",
" E } } } } } } } ' - Y } } } } } } } ' - E } } } } } } } ' - ",
" O ' } } } } } } } A O ' } } } } } } } A O ' } } } } } } } A ",
" e } } } } } } } } 9 e } } } } } } } } 6 e } } } } } } } } 9 ",
" G } } } } } } } ' O G } } } } } } } ' O G } } } } } } } ' O ",
" O ' } } } } } } } L O ' } } } } } } } I O ' } } } } } } } L ",
" 6 } } } } } } } } e 6 } } } } } } } ' w 6 } } } } } } } ' w ",
" V } } } } } } } E O N } } } } } } } E O V } } } } } } } Y O ",
" X } } } } } } } ' L . ' } } } } } } } G X } } } } } } } } L ",
" > } } } } } } } ' g > } } } } } } } ' g > } } } } } } } ' g ",
" j } } } } } } } ` - j } } } } } } } ' - j } } } } } } } ` - ",
" U } } } } } } } Y U } } } } } } } Y Y } } } } } } } Y ",
" O ` } } } } } } } k O ` } } } } } } } k O ` } } } } } } } k ",
" 6 ` } } } } } } ' , 6 ` } } } } } } ' , 6 ` } } } } } } ' , ",
" N } } } } } } } / V } } } } } } } E N ' } } } } } } E ",
" X E } } } } } } ' m . / } } } } } } } m X E } } } } } } } m ",
" ; ' } } } } } } ` , ; ' } } } } } } ` , ; ' } } } } } } ` , ",
" s } } } } } } } E X g ' } } } } } } / X s } } } } } } } E X ",
" L } } } } } } } L G } } } } } } ' L L } } } } } } ' L ",
" O E } } } } } } ' k O E } } } } } } ' k O E } } } } } } } k ",
" 1 ` } } } } } } ' 5 1 ` } } } } } } ` 5 1 ` } } } } } } ' 5 ",
" p ' } } } } } } E @ p ` } } } } } } E @ p ` } } } } } } E @ ",
" L } } } } } } } V X L ' } } } } } } A X I } } } } } } } A X ",
" ` } } } } } } ' t ` } } } } } } ' t / } } } } } } ' e ",
" * ' } } } } } } / * * ' } } } } } } / * * ' } } } } } } / * ",
" 0 ' } } } } } } E q ' } } } } } } E q ' } } } } } } E ",
" k ' } } } } } } G k } } } } } } } G k } } } } } } } S ",
" A } } } } } } ' s A } } } } } } ' s A ' } } } } } ' s ",
" O E } } } } } } ` ; O E } } } } } } ` ; O / } } } } } } ` ; ",
" 1 ` } } } } } } E X 1 ` } } } } } } Y X < ` } } } } } } E X ",
" y } } } } } } } S y ` } } } } } } S y } } } } } } ' S ",
" A } } } } } } ' g A } } } } } } ' j A } } } } } } ' j ",
" Y } } } } } } ` 5 Y } } } } } } / 5 Y } } } } } } ` 5 ",
" * ' } } } } } } E % * ' } } } } } ' / $ * ' } } } } } } E $ ",
" q ' } } } } } ' L q } } } } } } ' L q } } } } } } ' L ",
" V } } } } } } ' m V } } } } } } ' N V } } } } } } ' m ",
" Y } } } } } ' ' i U } } } } } ' ` i Y } } } } } ' ' i ",
" O ` } } } } } ` ` ; O ` } } } } } ` ` ; O ` } } } } } ` ` ; ",
" 9 } } } } } } ' Y X 6 } } } } } } } Y . 6 } } } } } } ' E . ",
" V } } } } } } } G V } } } } } } } G V } } } } } } } G ",
" ' } } } } } } } m ' } } } } } } } m ' } } } } } } } b ",
" ' } } } } } } } 0 ' } } } } } } } 9 ' } } } } } } } 0 ",
" } } } } } } } } O } } } } } } } } O } } } } } } } } O ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

359
assets/wall/inner.xpm
View file

@ -1,195 +1,202 @@
/* XPM */
static char *inner[] = {
/* columns rows colors chars-per-pixel */
"150 150 39 1 ",
"150 150 46 1 ",
" c black",
". c #040404",
"X c gray3",
". c #070707",
"X c #090909",
"o c #0C0C0C",
"O c #111111",
"O c #131313",
"+ c gray8",
"@ c gray10",
"# c gray12",
"@ c #1B1B1B",
"# c gray11",
"$ c #222222",
"% c #252525",
"& c #282828",
"* c gray18",
"& c gray17",
"* c #2D2D2D",
"= c #323232",
"- c #343434",
"; c gray22",
": c gray24",
"> c gray25",
", c gray27",
"< c #4C4C4C",
"1 c gray32",
"2 c gray33",
"3 c #656565",
"4 c gray40",
"5 c gray42",
"6 c gray46",
"7 c #767676",
"8 c gray49",
"9 c gray57",
"0 c #939393",
"q c gray60",
"w c #9F9F9F",
"e c #AFAFAF",
"r c gray72",
"t c #C3C3C3",
"y c #D2D2D2",
"u c #E2E2E2",
"i c #E9E9E9",
"p c #F4F4F4",
"a c white",
"- c #373737",
"; c gray23",
": c #3E3E3E",
"> c gray27",
", c #4B4B4B",
"< c gray31",
"1 c gray33",
"2 c #5A5A5A",
"3 c #5F5F5F",
"4 c gray39",
"5 c #676767",
"6 c DimGray",
"7 c #6F6F6F",
"8 c #717171",
"9 c gray47",
"0 c #818181",
"q c #898989",
"w c gray55",
"e c #909090",
"r c #929292",
"t c #9B9B9B",
"y c gray61",
"u c #A0A0A0",
"i c gray66",
"p c #AFAFAF",
"a c gray72",
"s c gray76",
"d c #CACACA",
"f c gray80",
"g c gray83",
"h c #E9E9E9",
"j c #F4F4F4",
"k c white",
/* pixels */
"kkkkkk . ",
"kkkkk . ",
"kkkk . ",
"kkk ",
"kk ",
"k . ",
" . . . ",
" ",
" . ",
" ",
" . . ",
" . ",
" . . ",
" ",
" ",
" . ",
" . . ",
" . ",
" ",
" . . ",
" ",
" . ",
" . ",
" . ",
" ",
" . . ",
" . . ",
" ",
" ",
" ",
" . ",
" . . ",
" . ",
" . . ",
" ",
" ",
" ",
" . . . ",
" . ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ... . .. . . ",
" .<94#. o><@ .<95@. O:<@ ",
" .9aai1. .$yaaa$ X9aai1. .$yaaa# ",
" .=iaap>o,iaaaa& .*iaap>o>iaaaa&. ",
" X6aaaiyiaaaaw. .X6aaaiyiaaaawX ",
" .Otaaaaaaap5o. +taaaaaaap5X . ",
" +waaaaae%X.. Owaaaaae%... ",
" :aaaaqo. >aaaaqo.. ",
" $aaaa< $aaaa< ",
" #aaaa: #aaaa: ",
" =aaaa; =aaaa; ",
" <aaaa; <aaaa; ",
" .<aaaa: <aaaa: ",
" .<aaaa> .<aaaa> ",
" .=aaaa, .=aaaa, ",
" .$aaaa, .%aaaa< ",
" .$aaaa< .$aaaa, ",
" @aaaa: @aaaa: ",
" $aaaa> $aaaa> ",
" #aaaa> $aaaa, ",
" $aaaa> $aaaa> ",
" #aaaa> #aaaa> ",
" $aaaa> $aaaa> ",
" #aaaa- #aaaa- ",
" $aaaa# $aaaa# ",
" #aaaa@ #aaaa@ ",
" @aaaa# @aaaa# ",
" $aaaa# $aaaa# ",
" #aaaa@ #aaaa# ",
" +aaaao +aaaao ",
" XaaaaX XaaaaX ",
" .Xaaaa. .oaaaa. ",
"............................................................oaaaa. ..........Xaaaa. ",
"............................................................XaaaaX ..........XaaaaX ",
"............................................................Xaaaa. ..........oaaaaX ",
"............................................................oaaaaX ..........oaaaaX ",
" ..... . . ... ..... . . ... ..... . . ... ... . . . XaaaaX ... .. .. oaaaaX ",
" . . . . . . .oaaaaX XaaaaX ",
" XaaaaX XaaaaX ",
" OaaaaX +aaaao ",
" @aaaaX @aaaaX ",
" #aaaaX $aaaaX ",
" %aaaaX $aaaaX ",
" $aaaaX $aaaaX ",
" *aaaaX *aaaaX ",
" ,aaaaX ,aaaaX ",
" <aaaaX <aaaaX ",
" <aaaaX <aaaaX ",
" ,aaaaX ,aaaa. ",
" 2aaaaX 2aaaaX ",
" 8aaaaX 8aaaaX ",
" 9aaaaX 9aaaaX ",
" .9aaaaX .9aaaaX ",
" .9aaaaX .9aaaaX ",
" .9aaaaX .9aaaaX ",
" X9aaaao X9aaaao ",
" %raaaa* $raaaa* ",
" 7uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 7uaaaa4 ",
" 6uaaaa4 7uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 7uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
" 6uaaaa4 6uaaaa4 ",
"a 6uaaaa4 6uaaaa4 a",
"aa 6uaaaa4 6uaaaa4 aa",
"aaa 6uaaaa4 6uaaaa4 aaa",
"aaaa 6uaaaa4 6uaaaa4 aaaa",
"aaaaa 7uaaaa4 6uaaaa4 aaaaa",
"aaaaaa 7uaaaa4 6uaaaa4 aaaaaa",
"aaaaaaa 6uaaaa4 6uaaaa4 aaaaaaa",
"aaaaaaaa 6uaaaa4 6uaaaa4 aaaaaaaa",
"aaaaaaaaa 6uaaaa4 6uaaaa4 aaaaaaaaa",
"aaaaaaaaaa 6uaaaa4 6uaaaa4 aaaaaaaaaa"
" . ",
" . ",
" . ",
" . .. . .. .. ",
" X#X.o o#X.X .X#X.X ",
" XpktXX+ XpktXX+ XpktXX+ ",
" .skk>.+XX..X Xskk>.+XX..o .skk>.OXXX.X ",
" Xekks. .+:O.. Xekks. X+:O . Xekks. X+;O . ",
" X1kkk:O0jkh+ X1kkk:O0jkh+ X1kkk:+0jkh+ ",
" .$kkkkkkkkk, $kkkkkkkkk, .$kkkkkkkkk, ",
" ekkkkkkkyo .ekkkkkkkyo ekkkkkkktO ",
" ..9kkkkhi1X. . 9kkkkhi1X . 9kkkkhi1X. ",
" Xogkkkk=XX. Xogkkkk=XX. Xogkkkk=XX. ",
" X*kkkk1 .. .*kkkk<.. X=kkkk< .. ",
" X0kkkjo. . .0kkkjo. . X0kkkjo. . ",
" .odkkky. .Xdkkky. .odkkky. ",
" .=kkkk*. .=kkkk*X .=kkkk*. ",
" .qkkkdo. .qkkkdo. .qkkkfo. ",
" ohkkk5o ohkkk5X Xhkkk5X ",
" .%kkkk+. .%kkkk+. .%kkkk+. ",
" .X2kkkfX. .X2kkkdX. ..2kkkfX ",
" .Xakkk:. .Xakkk:. XXakkk:.. ",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.+jkkkX XXXXXX+jkkko XXXXX.+jkkkX ",
" @X<kkkj. #X<kkkj. @X<kkkj. ",
" oXwkkky. OXwkkky. oXekkky. ",
"OOOOOOOoOOOOOOOoOOOOOOOoOOOOOOOoOOOOOOOoOOOOOOOoOOOOOOOoOOO.Ohkkk= OOoOo.Ohkkk*. OOOOO.Ohkkk* ",
"oOoOOOOOoOoOOOOOoOoOOOOOoOoOOOOOoOoOOOOOoOoOOOOOoOOoOOOOoOOX*kkkjo OOOOO.*kkkjo OOoOO.*kkkjo ",
" .X9kkkp. ..9kkkpX ..9kkkpX ",
" Xhkkk-. ohkkk; ohkkk;. ",
" .$kkkko %kkkko $kkkko ",
" .3kkkpX .3kkkpX X4kkkpX ",
" Xikkk>. Xikkk>. .ikkk>. ",
" ohkkk+ Ohkkk+ OhkkkO ",
" .*kkkgX .*kkkgo .*kkkgX ",
" X6kkke. .6kkkw. .6kkke. ",
" Xskkk; Xskkk; Xskkk; ",
" @jkkk+ #jkkk+ #jkkk+ ",
" -kkkp. -kkkp. ;kkkpX ",
" .8kkk2. .8kkk2 .8kkk1. ",
" .skkk* Xskkk& .skkk& ",
" Okkkjo OkkkjO OkkkjO ",
" .$kkksX %kkks. .$kkkaX ",
" :kkk6 :kkk5 :kkk6. ",
" .7kkk* .7kkk* .7kkk* ",
" XskkjO Xskkj+ XskkjO ",
" OjkkaX OjkkaX OjkkaX ",
" .=kkk4. .=kkk4. .=kkk4. ",
" X2kkk; .2kkk- X3kkk- ",
" Xpkkk# opkkk# Xpkkk# ",
" Okkkgo OkkkgX okkkgX ",
" .#kkkw. .#kkkw. .#kkkw. ",
" .<kkk, .<kkk, X1kkk, ",
" Xykkk$ Xukkk$ Xykkk$ ",
" ohkkjX ohkkjX ohkkjX ",
" .@kkka. .+kkka. .+kkka. ",
" X3kkk, X3kkk,. X4kkk,. ",
" .wkkkO .qkkko qkkkO ",
" .skkkX. .skkkX .skkkX. ",
" . . . . . . . kkkk kkkk. kkkk ",
" . . . .. . . . kkkk kkkk kkkk ",
" . . . . . . . . . . kkkk . kkkk kkkk ",
" . . . . . . . kkkk kkkk . . kkkk ",
". . . . . kkkk kkkk kkkk ",
" . . . . kkkk .kkkk kkkk ",
" . . . . . . . . . . kkkk kkkk . kkkk ",
" . . . . . . . . . . kkkk kkkk . kkkk ",
" . . . . . . kkkk . . kkkk kkkk . ",
" . . .. . .. . . kkkk . kkkk . kkkk ",
" . . . . . . kkkk .kkkk kkkk ",
". . . . . . . . kkkk . kkkk kkkk ",
" . . . . . . kkkk kkkk . kkkk . ",
" . . . . . . . . kkkk . kkkk kkkk ",
" . . . . . . . . . kkkk . kkkk. . kkkk ",
". . . . . . . kkkk kkkk kkkk ",
" . . . . . . . kkkk kkkk .kkkk . ",
" . . . . . . . kkkk kkkk kkkk ",
" . .. . . . . kkkk . kkkk . . kkkk ",
" . . . . . kkkk kkkk kkkk ",
" . . . . . . . . . kkkk . . kkkk kkkk ",
" . . . . . . . . . . kkkk kkkk kkkk ",
" . . . . . . . kkkk kkkk. . kkkk ",
" . . . . . . . kkkk .kkkk kkkk ",
" .. . . . . . kkkk. kkkk .kkkk ",
" . . . . . .. kkkk . kkkk kkkk . ",
" . . . . . . . . kkkk . kkkk . . kkkk ",
" . . . . . . . . kkkk kkkk kkkk ",
" . . . . . . kkkk kkkk kkkk ",
". . . . . . . . kkkk . kkkk .kkkk ",
" . . . . . . . . kkkk . kkkk kkkk ",
". . . . . . . . . kkkk kkkk . kkkk k",
" . . . . . kkkk . kkkk kkkk . kk",
" . . . . .. kkkk. kkkk . kkkk kkk",
" .. . . . . . . . kkkk kkkk. kkkk kkkk",
" . . . . . . kkkk .kkkk kkkk kkkkk",
". . . . . . . . . kkkk kkkk kkkk . kkkkkk",
" . . . . . . . . . kkkk . kkkk kkkk kkkkkkk",
" . . . . . . . kkkk . kkkk kkkk kkkkkkkk",
" . . . . kkkk kkkk . kkkk kkkkkkkkk",
" . . . . . . . . kkkk . kkkk. kkkk . kkkkkkkkkk",
" . . . . . . . . . kkkk. kkkk . kkkk kkkkkkkkkkk",
" . . . . . . . kkkk kkkk kkkk kkkkkkkkkkkk",
" . . . . . . . kkkk .kkkk . . kkkk kkkkkkkkkkkkk",
" . . . . . . . . kkkk kkkk kkkk kkkkkkkkkkkkkk",
" . . . . . . . . kkkk . kkkk kkkk kkkkkkkkkkkkkkk",
". . . . . . . . kkkk .kkkk . kkkk kkkkkkkkkkkkkkkk",
" . . . .. kkkk kkkk . kkkk kkkkkkkkkkkkkkkkk",
" .. . . . . . . . kkkk kkkk kkkk. kkkkkkkkkkkkkkkkkk",
" . . . . . . kkkk . kkkk .kkkk kkkkkkkkkkkkkkkkkkk",
"k . . .. . . . . . kkkk kkkk kkkk kkkkkkkkkkkkkkkkkkkk"
};

BIN
libtf/libtf.a Normal file
View file

Binary file not shown.

BIN
mlx/libmlx.a Normal file
View file

Binary file not shown.

BIN
mlx/libmlx_Linux.a Normal file
View file

Binary file not shown.

32
src/main/env.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/26 16:32:36 by mcolonna #+# #+# */
/* Updated: 2024/04/21 20:18:51 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 13:11:02 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,19 +15,19 @@
t_env g_env;
const t_consts g_consts = {
roomcases: {
{c: '0', object: NULL, surface: CASE_FLOOR_1},
{c: '1', object: wall_init, surface: CASE_FLOOR_1},
{c: 'P', object: snas_init, surface: CASE_FLOOR_1},
{c: 'C', object: ketchup_init, surface: CASE_FLOOR_1},
{c: 'E', object: exit_init, surface: CASE_FLOOR_1},
{c: 'F', object: firsk_init, surface: CASE_FLOOR_1},
{c: 'B', object: NULL, surface: CASE_BRIDGE},
{c: 'A', object: activablewall_init, surface: CASE_BRIDGE},
{c: 'U', object: ultimateketchup_init, surface: CASE_FLOOR_1},
{c: '\0'}
.roomcases = {
{.c = '0', .object = NULL, .surface = CASE_FLOOR_1},
{.c = '1', .object = wall_init, .surface = CASE_FLOOR_1},
{.c = 'P', .object = snas_init, .surface = CASE_FLOOR_1},
{.c = 'C', .object = ketchup_init, .surface = CASE_FLOOR_1},
{.c = 'E', .object = exit_init, .surface = CASE_FLOOR_1},
{.c = 'F', .object = firsk_init, .surface = CASE_FLOOR_1},
{.c = 'B', .object = NULL, .surface = CASE_BRIDGE},
{.c = 'A', .object = activablewall_init, .surface = CASE_BRIDGE},
{.c = 'U', .object = ultimateketchup_init, .surface = CASE_FLOOR_1},
{.c = '\0'}
},
levels: {
.levels = {
"rooms/01.ber",
"rooms/02.ber",
"rooms/03.ber",
@ -39,13 +39,13 @@ const t_consts g_consts = {
"rooms/09.ber",
"rooms/10.ber",
},
assetsmap: {
.assetsmap = {
{"floor/1", 50, 100, 50, 125, true},
{"floor/2", 50, 100, 50, 125, true},
// WALL
{"wall/border_top", 50, 100, 50, 125, true},
{"wall/border_bottom", 50, 100, 50, 100, true},
{"wall/inner", 50, 100, 30, 100, false},
{"wall/inner", 50, 120, 30, 100, false},
// BRIDGE
{"wall/bridge", 50, 100, 50, 125, false},
// OBJECTS
@ -180,7 +180,7 @@ const t_consts g_consts = {
{"text/big/youwin", 0, 600, 0, 400, false},
{"text/big/gameover", 0, 600, 0, 400, false},
},
spritesmap: {
.spritesmap = {
{WALL_BORDER_TOP, 50, 50, ANIMATION, 1, 1},
{WALL_BORDER_BOTTOM, 50, 50, ANIMATION, 1, 1},
{FLOOR_1, 50, 50, ANIMATION, 1, 1},

10
src/main/input_utils.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/20 15:05:54 by mcolonna #+# #+# */
/* Updated: 2024/04/20 15:16:29 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:42:43 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,10 +15,10 @@
t_input_hidden *get_input_hidden(void)
{
static t_input_hidden v = {
enter: false,
input_i: 0,
to_unpress: {false, false, false, false},
inputbuf: {false, false, false, false},
.enter = false,
.input_i = 0,
.to_unpress = {false, false, false, false},
.inputbuf = {false, false, false, false},
};
return (&v);

8
src/room/object_activablewall.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/15 15:27:03 by mcolonna #+# #+# */
/* Updated: 2024/04/21 16:09:40 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:44:28 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -37,9 +37,9 @@ static bool activablewall_walk_through(
t_object activablewall_init(t_memclass mc)
{
static const t_objecttype type
= {solid_firsk: false, solid_snas: false,
init: activablewall_init, loop: activablewall_loop,
draw: activablewall_draw, walk_through: activablewall_walk_through};
= {.solid_firsk = false, .solid_snas = false,
.init = activablewall_init, .loop = activablewall_loop,
.draw = activablewall_draw, .walk_through = activablewall_walk_through};
t_object r;
t_wall_data *data;

8
src/room/object_exit.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/08 15:01:16 by mcolonna #+# #+# */
/* Updated: 2024/04/21 17:06:07 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:44:51 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -59,9 +59,9 @@ static bool exit_walk_through(
t_object exit_init(t_memclass mc)
{
static const t_objecttype type
= {solid_firsk: true, solid_snas: true,
init: exit_init, loop: exit_loop, draw: exit_draw,
walk_through: exit_walk_through};
= {.solid_firsk = true, .solid_snas = true,
.init = exit_init, .loop = exit_loop, .draw = exit_draw,
.walk_through = exit_walk_through};
t_object r;
t_exit_data *data;

18
src/room/object_firsk.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/11 13:55:04 by mcolonna #+# #+# */
/* Updated: 2024/04/20 16:17:08 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:45:11 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -36,15 +36,15 @@ static void firsk_draw(t_object *obj, t_point p)
t_object firsk_init(t_memclass mc)
{
static const t_objecttype type
= {solid_firsk: false, solid_snas: false,
init: firsk_init, loop: firsk_loop, draw: firsk_draw,
walk_through: NULL};
= {.solid_firsk = false, .solid_snas = false,
.init = firsk_init, .loop = firsk_loop, .draw = firsk_draw,
.walk_through = NULL};
static const t_character_sprites sprites = {
still: SPR_FIRSK,
walk_left: SPR_FIRSK_WALK_LEFT,
walk_right: SPR_FIRSK_WALK_RIGHT,
walk_up: SPR_FIRSK_WALK_UP,
walk_down: SPR_FIRSK_WALK_DOWN,
.still = SPR_FIRSK,
.walk_left = SPR_FIRSK_WALK_LEFT,
.walk_right = SPR_FIRSK_WALK_RIGHT,
.walk_up = SPR_FIRSK_WALK_UP,
.walk_down = SPR_FIRSK_WALK_DOWN,
};
t_object r;
t_firsk_data *data;

14
src/room/object_ketchup.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/15 15:27:03 by mcolonna #+# #+# */
/* Updated: 2024/04/18 17:14:55 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:45:21 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -38,12 +38,12 @@ t_object ketchup_init(t_memclass mc)
{
static const t_objecttype type
= {
solid_firsk: true,
solid_snas: false,
init: ketchup_init,
loop: ketchup_loop,
draw: ketchup_draw,
walk_through: ketchup_walk_through};
.solid_firsk = true,
.solid_snas = false,
.init = ketchup_init,
.loop = ketchup_loop,
.draw = ketchup_draw,
.walk_through = ketchup_walk_through};
t_object r;
t_wall_data *data;

18
src/room/object_snas.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/15 15:27:03 by mcolonna #+# #+# */
/* Updated: 2024/04/21 16:30:38 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:45:37 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -85,15 +85,15 @@ static void snas_draw(t_object *obj, t_point p)
t_object snas_init(t_memclass mc)
{
static const t_objecttype type
= {solid_firsk: false, solid_snas: false,
init: snas_init, loop: snas_loop, draw: snas_draw,
walk_through: snas_walk_through};
= {.solid_firsk = false, .solid_snas = false,
.init = snas_init, .loop = snas_loop, .draw = snas_draw,
.walk_through = snas_walk_through};
static const t_character_sprites sprites = {
still: SPR_SNAS,
walk_left: SPR_SNAS_WALK_LEFT,
walk_right: SPR_SNAS_WALK_RIGHT,
walk_up: SPR_SNAS_WALK_UP,
walk_down: SPR_SNAS_WALK_DOWN,
.still = SPR_SNAS,
.walk_left = SPR_SNAS_WALK_LEFT,
.walk_right = SPR_SNAS_WALK_RIGHT,
.walk_up = SPR_SNAS_WALK_UP,
.walk_down = SPR_SNAS_WALK_DOWN,
};
t_object r;
t_snas_data *data;

8
src/room/object_ultimateketchup.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/15 15:27:03 by mcolonna #+# #+# */
/* Updated: 2024/04/21 19:50:16 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:45:46 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -29,9 +29,9 @@ static void ultimateketchup_draw(t_object *obj, t_point p)
t_object ultimateketchup_init(t_memclass mc)
{
static const t_objecttype type
= {solid_firsk: true, solid_snas: true,
init: ultimateketchup_init, loop: ultimateketchup_loop,
draw: ultimateketchup_draw, walk_through: NULL};
= {.solid_firsk = true, .solid_snas = true,
.init = ultimateketchup_init, .loop = ultimateketchup_loop,
.draw = ultimateketchup_draw, .walk_through = NULL};
t_object r;
t_ultimateketchup_data *data;

8
src/room/object_wall.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/15 15:27:03 by mcolonna #+# #+# */
/* Updated: 2024/04/18 15:58:27 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:46:03 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -27,9 +27,9 @@ static void wall_draw(t_object *obj, t_point p)
t_object wall_init(t_memclass mc)
{
static const t_objecttype type
= {solid_firsk: true, solid_snas: true,
init: wall_init, loop: wall_loop, draw: wall_draw,
walk_through: NULL};
= {.solid_firsk = true, .solid_snas = true,
.init = wall_init, .loop = wall_loop, .draw = wall_draw,
.walk_through = NULL};
t_object r;
t_wall_data *data;

8
src/room/pathfinding.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/10 18:19:19 by mcolonna #+# #+# */
/* Updated: 2024/04/19 17:32:16 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:43:20 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -66,9 +66,9 @@ static t_direction pathfinding_checkdirections(
t_direction pathfinding(t_point start, t_point finish, bool for_firsk)
{
const t_pathfinding_env env = {
start: start,
finish: finish,
mc: mem_subclass(error_err, g_env.mc)
.start = start,
.finish = finish,
.mc = mem_subclass(error_err, g_env.mc)
};
t_path_map map;
t_point case_checking;

8
src/room/pathfinding_utils.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/15 17:35:13 by mcolonna #+# #+# */
/* Updated: 2024/04/18 18:30:25 by mcolonna ### ########.fr */
/* Updated: 2024/04/22 12:43:44 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,9 +21,9 @@ void path_map_case_init(t_point p, void **el, void *args_p)
const t_sprite *surface
= &room.surfaces[p.y * room.width + p.x];
const t_path_map_case r = {
to_check: false,
before: point_init(-1, -1),
solid: p.x == 0 || p.x == room.width - 1 || p.y == 0
.to_check = false,
.before = point_init(-1, -1),
.solid = p.x == 0 || p.x == room.width - 1 || p.y == 0
|| p.y == room.height - 1 || (
obj && ((args->for_firsk && obj->type.solid_firsk)
|| (!args->for_firsk && obj->type.solid_snas)))