From 5929da2766641a60f3032a64f081cf4619bdec45 Mon Sep 17 00:00:00 2001 From: maxgrf Date: Mon, 10 Nov 2025 13:30:02 +0100 Subject: [PATCH] update main --- Start_Windows/game.c | 6 ++---- Start_Windows/game.o | Bin 5240 -> 5162 bytes Start_Windows/main.c | 14 +++++++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Start_Windows/game.c b/Start_Windows/game.c index 6b74bde..e0f2b6e 100644 --- a/Start_Windows/game.c +++ b/Start_Windows/game.c @@ -19,7 +19,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi int placedWords = 0; unsigned int attemps = 0; - unsigned int check_direction = 0, check_overlap = 0; + unsigned int check_overlap = 0; int zeile = 0, spalte = 0, len = 0; //Alle Felder mit ? befüllen @@ -46,14 +46,12 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi { zeile = rand() % searchFieldLen; spalte = rand() % searchFieldLen; - check_direction = 1; } if (direction == 1) // 1 = HORIZONTAL { zeile = rand() % searchFieldLen; spalte = rand() % searchFieldLen; - check_direction = 1; } for(int i = 0; i < len; i++) @@ -132,7 +130,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi } } } - /* + // fügt zufällige Buchstaben ein for(int l = 0; l < searchFieldLen; l++){ for(int m = 0; m < searchFieldLen; m++ ){ diff --git a/Start_Windows/game.o b/Start_Windows/game.o index ad8b6e89564473e9037fb0cb92ba3ef2cb5d4282..212522900c64fd83f9e56aaa077af4d9fe99b886 100644 GIT binary patch delta 1742 zcma)7T}WG396$eib2Kr=#C#Y{bkU|m>snW(qwB0+)Z0c;)(xeyx^|*jBgW`73LBGv zq0%gS*xg;3n>It(i=!`_-3PLVCNM3m9eEHc%m+Jsh|^Nh!W?XM|8wt62JIep;hyvR zfBpU+=Unc7#a9)&z9|D?PfXM~b4qzaiaA1V<%v}za9W%zryZ1#Lh+s}|G0(_KMEa2 z*`Jujznw5E6+t<@pF@aN62PUiVQ{t{Nu)t=L$M@6IlO?YRk{ZjD3TtacS{~229kZAs9^FyA}VZnrk6BaLs-}V6l#USkzd0?3UP|z zrDb8AMQ-i^AyHvH6I|+nq$d)W`6EJd^Cz?`LL!ok?}uFRlnWB!-{43h(s?&LahHr8 zmhFp-?vJs;NHQYqJfqo0PxybH%fgymStDj<{Kl)Fq8#nqi3)2FN@glm+T8X`8^6eb{P2t_%^jj9xoTzN5}B z-W(N>V6_QuOLjudNfCsUzL zt#E5x?&iPBYnID9`%HQ5*!>DpNtZPCdhGd{RV`!%3t3@>EQT=`#vwL-c!Dv`avCBm`z( zL1#MJ{LzTscw8|Df_-NCyp*8@cRiaH5}&tHzhp#&^gU($CqA zh3Ql<>%cEYO<{6WN^b3|p`KvSJ2*T_Z23wOAN2aXy#tqr#=Rr{o?%j;>igh5Z@=G5 z>{=z?TQEA@;}4?3qA0q-?+p;UOOYD&ud8L8QTG7O0S1Xft+$K6$P8|Lt5gpNkYb|} z-a!a|T~+I)qdG_EJRetO_RX*d`uaz_y}|yW0IAGlVZ8Wbh_6zuU1_g=a>}fbw&_1s zl`S#>A^WVR0n+AF96W?St`706>VZ}-vpR9a&9Y8+3AaidWX`(?dWpud@QdyOaCTm7 zDu8^cUOy~-t#1qE)>FqtnnySd1gSymrUgD)!lW*0Wm}Be>*#Ze!loz;4bK>h+{|0A>HHeUhTLe%^a{s9N5 Bqk#Yb delta 1785 zcmZ`)Z%k8H6hHU99&DlIwfrd+#iDG2AtE~Gh_z1C8>*A&k~!JtL48DalEZQ;W*l4UV2Q$r{pX3{aXfMW?uNCp8TLlfPGWB0y4o!hdT^q${6 z=XZYR+;{IyKdpFBVQcAe03Y*;ZB_Om5n#0dV3(At2nj16mg9K@=u~ccUE3@GeQYrx zX?$=g4_A>H(2s^5x+f#Ibm!8|F6|YRv`G0cjXSl$KnGmy? z2_Ct70b*G)eL&{yGUG6wua2hQ>XEze5$VF9wxI=(E_|Y)2R7;A`wXS%7@J}CqUL2y zZfD;#Q?ryGNd3IpXeo)aF5fO7GF>8CZ~p)A^j=4dgS@^sNm;XFwd5L`dBX+5zUFJD z1RY}?j`?U>y423jOYUY3^{o7pAv(z-lRjD@og06+yqu&<0eR^7%j%Hjox%xr=6rBl z$8NEm;Vo)AK1=Ebzs4vDoy{^S9U2jU^lfKk>}m=(wZK{Lezp)4u=42H#@lQb6stI6 z=pHeXIzhJcLl=~=_^T1DF@vwe1@*lZyF6wo(pSn}jZwl`T&><+aWEc@v*gaxvjCKH4GXPS@k}SlCI9CaFjXn zbw>jU2Roq1tFLzDykNAqN3#V0J?sOKb|^MB@|^gJ`jxdfeh5J9Gq_ugt&xscd*kVo zk(MqfGw27z34`<#zmaT^znkBf%d3jY)p*V+BPwegfIoQE)<$zXPv`0V1wbs)id6&f zd&dW(bp@mFl1HcPJw@ zX750kg2f+WE(jJ9MTfNv-64*%8gP?ltFVOI0W9F=2Q2dA8jc#Ukehy7<44D7EDYgl z-JP$y-F|NWSEj@t$GkT%JBrR~^oG#WkCg+McNy0n!2B2%ZbnZC%NNmm4)b0$oYH1q z#`z5Tn6x0aRbeHsu^;VX@i|3I3R~n1etlgDz&!Kn9Iw(2}|=-60d|9p^?;r?>6}h Dtunu| diff --git a/Start_Windows/main.c b/Start_Windows/main.c index a1d4f24..c9d258a 100644 --- a/Start_Windows/main.c +++ b/Start_Windows/main.c @@ -36,12 +36,18 @@ int main(int argc, char *argv[]) // Create the word salad by placing words into grid placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount); - // TODO: + // TODO: (if Schleife implementieren, die das prüft) // Check if all words were successfully placed // Start the game if successful // error message if some words couldn't be placed - // wordcount mit placedwords vergleichen + if (placedWords == wordCount){ + startGame(wordSalad, SALAD_SIZE, words, wordCount, 750); + } + else{ + printf("Error. The words couldn't be placed.\n"); + return -1; + } } else @@ -53,4 +59,6 @@ int main(int argc, char *argv[]) } return exitCode; -} \ No newline at end of file +} + +//