From 6027c2a061ab79fc69770f170d219309999d630c Mon Sep 17 00:00:00 2001 From: Hofmann Jonas Date: Tue, 4 Nov 2025 11:20:21 +0100 Subject: [PATCH] ausbesserungen aus stunde --- Start_Windows/game.c | 19 ++++++++++++++----- Start_Windows/game.o | Bin 8507 -> 8951 bytes 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Start_Windows/game.c b/Start_Windows/game.c index 3f40b9b..f7fa67d 100644 --- a/Start_Windows/game.c +++ b/Start_Windows/game.c @@ -107,22 +107,26 @@ int checkIfPositionIsFree(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN] int placeWord(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], wordPosition position, const char currentWord[], unsigned int currentWordLen, unsigned int serchFieldLen) { int i = 0; + int j = 0; if (position.alignment == HORIZONTAL) { - - for (i = position.startingCell; (i < serchFieldLen) && (i < currentWordLen); i++) + for (i = position.startingCell; (i < serchFieldLen) || (j < currentWordLen); i++) { - salad[position.rowOrColumn][i] = currentWord[i]; + salad[position.rowOrColumn][i] = currentWord[j]; + printf("%c",currentWord[j]); + j++; } salad[position.rowOrColumn][i] = '\0'; } else if (position.alignment == VERTIKAL) { - for (i = position.startingCell; (i < serchFieldLen) && (i < currentWordLen); i++) + for (i = position.startingCell; (i < serchFieldLen) || (j < currentWordLen); i++) { - salad[i][position.rowOrColumn] = currentWord[i]; + salad[i][position.rowOrColumn] = currentWord[j]; + printf("%c",currentWord[j]); + j++; } salad[i][position.rowOrColumn] = '\0'; } @@ -165,6 +169,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi srand(time(NULL)); initializeWordsalad(salad, searchFieldLen); + showWordSalad(salad, searchFieldLen); for (i = 1; i <= wordCount; i++) { @@ -178,7 +183,11 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi if (positionFound) { + strcpy(currentWord, "\0"); strcpy(currentWord, words[i-1]); + + printf("%d, %d, %d \n", currentWordPosition.alignment, currentWordPosition.rowOrColumn, currentWordPosition.startingCell); + printf("%s\n", currentWord); placedWords += placeWord(salad, currentWordPosition, currentWord, strlen(currentWord), searchFieldLen); } } diff --git a/Start_Windows/game.o b/Start_Windows/game.o index 1b664f5a81e27cf8fdcca4cd7fb6d68a75d5ef37..b2fada6ef1cf0c3dddcbb90de172ad8129869c5f 100644 GIT binary patch delta 3439 zcmbVPeQZ&ffI*V7gr&rVIKin6A&ppolnt^pb|4Vq%yCNT z0C&wmi$Ykv+ii4Z8xdV8S~n(TT{S=xr4!MV4zaDGfQ zqrnVtH_Ljlvjyr~YLl_PRG+TNYde0=pb+B%`LM$HE&*^m zSP7{%e&hsLSI*i=MeQ~NK#dDvbGdHI-L`=LP# zj(OQT=uHQ7VwP`lI$i2;m7kD!%AHO=5 zo@`Sl!i)cmPKFoQCx)sAv5lOLOm44_kejxjgYB1BCtm+MS04{Akn!*$nG7#Bhg*^t zQL#DPlswNevZwUAL4x_OYEH)&$k(IonLlZYA zP>XVfoMOIFgt?Sf_uCi)3I97gg%5>S*v4OGgG#wHzsSC>%+f|xHa^a}3%(eAUk0d0 zU%b7C8zYFAw`Sa~5yZSbfnPV`s@Up){spwHIE0&x0#UFF>}p-l6y~&=zM5mD_X1P&AtC8;*hT z7O{VUlRRoD*112X^`Qz!_azSPOeABU?;Gli!5p7LUXJJukTbtRQ^HT~oc}F^QU(Y= z|8u?CBxDq65PqZZsHM!1v>$F{@jkHd(7B0q6hS{2xTk{tWV|mG-E|uS)Ij`ekt1>v+?Wjd;yO@&fGaB^^YZ!xRiXFx)Qn_yzID)Dbx6;$TNSm5L`v;UwRfu)lNG!3(>%H7 z{`8*8OW_;26reyGfX4&}v?=^?cIws(=db6SA8^kxzqM51drHdK&8*eBHj0Ziob}cN z-u`{@{sYm0Tz=8f_GCN`Qk&+wIP3D;!u4J})LPtafjM^3x}OxVF9qDJ*5)N|ut#jQ z#K)entt_m@Q>Upt;GbhZvaKN{?9VoT@qVOBd%N*?;XxsFT*UP)V>bI%2Zbo!_r@ZS zmGx?~`jE;F+Uw%AWTOv>N{KTyzNpJVoTe7<5g$QiGv&&9U(_YxZLh9CrcA|U$TzGs z*7)-6EQCZ|+<~(hq)KtAvcJ^NRqe&NC#$uPoCdN%Rn@3V4~yHmTtrpx zi|*`TYBSY?3~J$d_zz_f`?ACR+2UHz^2pNw@Cvg}<@S_j>|-xDO1esFi8dWszj_k7 zLaCO#=1|YQECNSK8l!{N`01NMyY^7h%L!8^R8-K3yMuxPkFe#=YGPtroIc}EQGxto zChq(j**Qk-hp4HRdON5!NKHYyuAX`?QCkmP_X=GZq?H+Jevhg@pxZ$*&~~~C8?u=; z^Cn0`*cf^=$q=NTJ+!cgR=+|$x7cZSd28ik|GRDB9_qbItAkYCPswA4sd9Uas)yLW z+!x4g_8rgqrn7X}7HU?4S7_rUY93Jb(vHj2$HTZpi?ETTW+$!WKu!dylXq;U2H8Ec z#bS! z-xrr=-DWY$h0^sxlOnXuCia2XpN1l|uEEa$GgzYj1#IL>>)2foKgM*#OTVtkuXZs6+b)|+ja>Ozvt~7s)sc;zg79KG?!p|b|Yuxt*x+8i`n1J5v5ok)F+lX{8i-I#_ zqPj&0k>1-QxPi2QDS=)P=&y)$lMe-Fz`4;KIt2;{^b8{1;(5WH7wA=i{*u+JBXC!c zfODw3Za}2F*)0$PC}zJcb*1$=tVUT!{2`;GMuFA~v{9f<0!0Pt6sQN0K4uxBDoqLq zj@#;7BrV7xL5>LSIl-M4+?#^CDL4bkIaCno1Fsfbz2Le9*OTSgt+MZi`R^ZrK=x9a zMYsI;+-LrT41a;>Ol>OuWC|Hx&V+OLd`QSrva2%7p*D(4L1V-7h74G%PCnpkkS+5Rpu-p?g;E sSBM44(t?((ik0p5H=9PrQvCVIru?m5{VAu}gO)0Gj-oj82mb*154jL$DF6Tf delta 2925 zcmZ`*eQX>@6@RmPv$yA6`}RJ3zOxRBCAmPLt>THXsgJb3yD9nxbo35QKZDR7s>$kR<5)vH%Hu5zZX$d&M1hixU0!SM>pQR1E4>O6Is&&|~6Ny(c)gzOliQf6ohSPd0eZ zyd|nV+mx37h)&OKUTUaXjWCOjv|mvHn$aKCKf>fC5L0~$v)zlB>NR|Z5O-tEf$0dr zC$1IkE2o}9QJFS2F**oV|+TuM@BM}&!k%SjATIleC;{ABWsK$0&drRY$z5> z;be+>4<70}eDLE#T?5#7GI?mI?_&rV@Y(sv)J$eHGdVj0N3BgNpL;t*N`m6ZKe^>2!U%PZ!(>l0avGg9Gkny#O^Ik&yUWG1OF|v zI*BA{5OTQJnD>X+GSU;XC!U&}AAfvwdUPCaQd%I3&uM(9unRBZP)2+9X7tAhl^n2g zYK_=4&FRV{+|tRHlABhJ!|gnt0F%Vgkm59gF>sNmlCk;JXePB8a+%XuS{f=pqlr^| zcHt7PoE>+${3^mi+~vdhxSkUzI}OVVjw;J;_slNLWMKKcV-rSgm$zv9W>oh;ak!G_k12E0qhqP?ILS-HxAOG3w*(b^+jB{@l~iWG4zK?08vgTCi`+ULoRIuQCFLq81k#Z#sjOH^nNt;B;SsoGhent|xX?T=pJkCBn3Jv-6_eYGh?%!rEc37ffoRSH(r^5f&Cdx1wd8xPc-gL-=*z zK4(qT#FZ--%s1!@fvWE{I*fLsFM!*TgBbBO^>bpY6^B;vlq_mMrqaMnHnRPZLT9yB zAMr82yEA+`!f?3BSYLoZaW(V>n$WyNJn!2!-x6I>FtIJUqxt65O5Ot<5~V%Duz9^(DR|!Jh!d<$9j)#ESLv z4yqEo3oCWlZm9`gdW4(9JpK|d{Q)=8)8S1|-c??q`*~|Zx_a^huC_ny%RIuv@A7zp z8^<~O++D6s5z@s|l#-1ou-%KX<9t zN@H0YTbT*BF=Y+JT%;_l-2Z9UEx$YedBJwd2$n12^+^5BhfWt{yGpEQm7Zcvy}@po zZe3cR(nLdfG#f&bI(%HPg73JEej(AD5)I;dIK3hK80u}iPatZrQC6aN5$&+K|4Qx^ z{4jRf-0vmACg466@0Guk#a)QF1K&{_?U$&>ZsRh;i$N5m^Sa2%R8bkZ4JwYk5NkuSo7SiHb0%PT&tqgaAtI%vkoDvQ>k~$!}aDx-~@U z7i2(-B zYPut>mgd!~O>+J=;?N