From 7c1fe3828d1f4a15e4e8d46b9917566053e8264b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Szostak?= Date: Sat, 13 Apr 2024 18:06:35 +0200 Subject: [PATCH] Assets now load independently from which place you run the program --- {assets => fremen-assets}/A.png | Bin {assets => fremen-assets}/B.png | Bin {assets => fremen-assets}/D.png | Bin {assets => fremen-assets}/DH.png | Bin {assets => fremen-assets}/E.png | Bin {assets => fremen-assets}/F.png | Bin {assets => fremen-assets}/G.png | Bin {assets => fremen-assets}/GH.png | Bin {assets => fremen-assets}/H.png | Bin {assets => fremen-assets}/I.png | Bin {assets => fremen-assets}/J.png | Bin {assets => fremen-assets}/K.png | Bin {assets => fremen-assets}/KH.png | Bin {assets => fremen-assets}/L.png | Bin {assets => fremen-assets}/M.png | Bin {assets => fremen-assets}/N.png | Bin {assets => fremen-assets}/O.png | Bin {assets => fremen-assets}/R.png | Bin {assets => fremen-assets}/S.png | Bin {assets => fremen-assets}/SH.png | Bin {assets => fremen-assets}/T.png | Bin {assets => fremen-assets}/TH.png | Bin {assets => fremen-assets}/U.png | Bin {assets => fremen-assets}/W.png | Bin {assets => fremen-assets}/Y.png | Bin {assets => fremen-assets}/Z.png | Bin src/main.c | 68 ++++++++++++++++++------------- 27 files changed, 40 insertions(+), 28 deletions(-) rename {assets => fremen-assets}/A.png (100%) rename {assets => fremen-assets}/B.png (100%) rename {assets => fremen-assets}/D.png (100%) rename {assets => fremen-assets}/DH.png (100%) rename {assets => fremen-assets}/E.png (100%) rename {assets => fremen-assets}/F.png (100%) rename {assets => fremen-assets}/G.png (100%) rename {assets => fremen-assets}/GH.png (100%) rename {assets => fremen-assets}/H.png (100%) rename {assets => fremen-assets}/I.png (100%) rename {assets => fremen-assets}/J.png (100%) rename {assets => fremen-assets}/K.png (100%) rename {assets => fremen-assets}/KH.png (100%) rename {assets => fremen-assets}/L.png (100%) rename {assets => fremen-assets}/M.png (100%) rename {assets => fremen-assets}/N.png (100%) rename {assets => fremen-assets}/O.png (100%) rename {assets => fremen-assets}/R.png (100%) rename {assets => fremen-assets}/S.png (100%) rename {assets => fremen-assets}/SH.png (100%) rename {assets => fremen-assets}/T.png (100%) rename {assets => fremen-assets}/TH.png (100%) rename {assets => fremen-assets}/U.png (100%) rename {assets => fremen-assets}/W.png (100%) rename {assets => fremen-assets}/Y.png (100%) rename {assets => fremen-assets}/Z.png (100%) diff --git a/assets/A.png b/fremen-assets/A.png similarity index 100% rename from assets/A.png rename to fremen-assets/A.png diff --git a/assets/B.png b/fremen-assets/B.png similarity index 100% rename from assets/B.png rename to fremen-assets/B.png diff --git a/assets/D.png b/fremen-assets/D.png similarity index 100% rename from assets/D.png rename to fremen-assets/D.png diff --git a/assets/DH.png b/fremen-assets/DH.png similarity index 100% rename from assets/DH.png rename to fremen-assets/DH.png diff --git a/assets/E.png b/fremen-assets/E.png similarity index 100% rename from assets/E.png rename to fremen-assets/E.png diff --git a/assets/F.png b/fremen-assets/F.png similarity index 100% rename from assets/F.png rename to fremen-assets/F.png diff --git a/assets/G.png b/fremen-assets/G.png similarity index 100% rename from assets/G.png rename to fremen-assets/G.png diff --git a/assets/GH.png b/fremen-assets/GH.png similarity index 100% rename from assets/GH.png rename to fremen-assets/GH.png diff --git a/assets/H.png b/fremen-assets/H.png similarity index 100% rename from assets/H.png rename to fremen-assets/H.png diff --git a/assets/I.png b/fremen-assets/I.png similarity index 100% rename from assets/I.png rename to fremen-assets/I.png diff --git a/assets/J.png b/fremen-assets/J.png similarity index 100% rename from assets/J.png rename to fremen-assets/J.png diff --git a/assets/K.png b/fremen-assets/K.png similarity index 100% rename from assets/K.png rename to fremen-assets/K.png diff --git a/assets/KH.png b/fremen-assets/KH.png similarity index 100% rename from assets/KH.png rename to fremen-assets/KH.png diff --git a/assets/L.png b/fremen-assets/L.png similarity index 100% rename from assets/L.png rename to fremen-assets/L.png diff --git a/assets/M.png b/fremen-assets/M.png similarity index 100% rename from assets/M.png rename to fremen-assets/M.png diff --git a/assets/N.png b/fremen-assets/N.png similarity index 100% rename from assets/N.png rename to fremen-assets/N.png diff --git a/assets/O.png b/fremen-assets/O.png similarity index 100% rename from assets/O.png rename to fremen-assets/O.png diff --git a/assets/R.png b/fremen-assets/R.png similarity index 100% rename from assets/R.png rename to fremen-assets/R.png diff --git a/assets/S.png b/fremen-assets/S.png similarity index 100% rename from assets/S.png rename to fremen-assets/S.png diff --git a/assets/SH.png b/fremen-assets/SH.png similarity index 100% rename from assets/SH.png rename to fremen-assets/SH.png diff --git a/assets/T.png b/fremen-assets/T.png similarity index 100% rename from assets/T.png rename to fremen-assets/T.png diff --git a/assets/TH.png b/fremen-assets/TH.png similarity index 100% rename from assets/TH.png rename to fremen-assets/TH.png diff --git a/assets/U.png b/fremen-assets/U.png similarity index 100% rename from assets/U.png rename to fremen-assets/U.png diff --git a/assets/W.png b/fremen-assets/W.png similarity index 100% rename from assets/W.png rename to fremen-assets/W.png diff --git a/assets/Y.png b/fremen-assets/Y.png similarity index 100% rename from assets/Y.png rename to fremen-assets/Y.png diff --git a/assets/Z.png b/fremen-assets/Z.png similarity index 100% rename from assets/Z.png rename to fremen-assets/Z.png diff --git a/src/main.c b/src/main.c index 241e6ef..921d65f 100644 --- a/src/main.c +++ b/src/main.c @@ -10,6 +10,16 @@ #define CHAR_WIDTH ((SCREEN_WIDTH/800)*64) #define CHAR_HEIGHT ((SCREEN_HEIGHT/600)*64) +char concat_result[255]; + +char *concat(const char* str1, const char* str2){ + + strcpy(concat_result, str1); + strcat(concat_result, str2); + + return concat_result; +} + enum Character { B = 1, F, @@ -187,7 +197,9 @@ bool cmd_flag = false; int cursor_pos_backup = 0; int main(int argc, char *argv[]){ - + + const char *executablePath = GetApplicationDirectory(); + int msglen = 0; if(argc > 1){ @@ -212,33 +224,33 @@ int main(int argc, char *argv[]){ Image characters_img[28] = {0}; characters_img[0] = GenImageColor(1, 1, WHITE); - characters_img[1] = LoadImage("assets/B.png"); - characters_img[2] = LoadImage("assets/F.png"); - characters_img[3] = LoadImage("assets/M.png"); - characters_img[4] = LoadImage("assets/T.png"); - characters_img[5] = LoadImage("assets/TH.png"); - characters_img[6] = LoadImage("assets/D.png"); - characters_img[7] = LoadImage("assets/DH.png"); - characters_img[8] = LoadImage("assets/N.png"); - characters_img[9] = LoadImage("assets/S.png"); - characters_img[10] = LoadImage("assets/SH.png"); - characters_img[11] = LoadImage("assets/Z.png"); - characters_img[12] = LoadImage("assets/J.png"); - characters_img[13] = LoadImage("assets/K.png"); - characters_img[14] = LoadImage("assets/KH.png"); - characters_img[15] = LoadImage("assets/G.png"); - characters_img[16] = LoadImage("assets/GH.png"); - characters_img[17] = LoadImage("assets/Q.png"); - characters_img[18] = LoadImage("assets/L.png"); - characters_img[19] = LoadImage("assets/R.png"); - characters_img[20] = LoadImage("assets/W.png"); - characters_img[21] = LoadImage("assets/Y.png"); - characters_img[22] = LoadImage("assets/H.png"); - characters_img[23] = LoadImage("assets/A.png"); - characters_img[24] = LoadImage("assets/E.png"); - characters_img[25] = LoadImage("assets/I.png"); - characters_img[26] = LoadImage("assets/O.png"); - characters_img[27] = LoadImage("assets/U.png"); + characters_img[1] = LoadImage(concat(executablePath,"fremen-assets/B.png")); + characters_img[2] = LoadImage(concat(executablePath,"fremen-assets/F.png")); + characters_img[3] = LoadImage(concat(executablePath,"fremen-assets/M.png")); + characters_img[4] = LoadImage(concat(executablePath,"fremen-assets/T.png")); + characters_img[5] = LoadImage(concat(executablePath,"fremen-assets/TH.png")); + characters_img[6] = LoadImage(concat(executablePath,"fremen-assets/D.png")); + characters_img[7] = LoadImage(concat(executablePath,"fremen-assets/DH.png")); + characters_img[8] = LoadImage(concat(executablePath,"fremen-assets/N.png")); + characters_img[9] = LoadImage(concat(executablePath,"fremen-assets/S.png")); + characters_img[10] = LoadImage(concat(executablePath,"fremen-assets/SH.png")); + characters_img[11] = LoadImage(concat(executablePath,"fremen-assets/Z.png")); + characters_img[12] = LoadImage(concat(executablePath,"fremen-assets/J.png")); + characters_img[13] = LoadImage(concat(executablePath,"fremen-assets/K.png")); + characters_img[14] = LoadImage(concat(executablePath,"fremen-assets/KH.png")); + characters_img[15] = LoadImage(concat(executablePath,"fremen-assets/G.png")); + characters_img[16] = LoadImage(concat(executablePath,"fremen-assets/GH.png")); + characters_img[17] = LoadImage(concat(executablePath,"fremen-assets/Q.png")); + characters_img[18] = LoadImage(concat(executablePath,"fremen-assets/L.png")); + characters_img[19] = LoadImage(concat(executablePath,"fremen-assets/R.png")); + characters_img[20] = LoadImage(concat(executablePath,"fremen-assets/W.png")); + characters_img[21] = LoadImage(concat(executablePath,"fremen-assets/Y.png")); + characters_img[22] = LoadImage(concat(executablePath,"fremen-assets/H.png")); + characters_img[23] = LoadImage(concat(executablePath,"fremen-assets/A.png")); + characters_img[24] = LoadImage(concat(executablePath,"fremen-assets/E.png")); + characters_img[25] = LoadImage(concat(executablePath,"fremen-assets/I.png")); + characters_img[26] = LoadImage(concat(executablePath,"fremen-assets/O.png")); + characters_img[27] = LoadImage(concat(executablePath,"fremen-assets/U.png")); for(int i = 0; i <= 27; i++){ ImageResizeNN(&characters_img[i], CHAR_WIDTH, CHAR_HEIGHT);