Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/kohlerma104069/Wortsalat

Startcode/main.c

@@ -7,6 +7,45 @@
 #define MAX_NUMBER_OF_WORDS 100
 #define SALAD_SIZE 20
 
+<<<<<<< HEAD
+=======
+int checkSalad(char words[][MAX_WORD_LEN], char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], int placedWords, int wordCount){
+    //Iteriere über alle verfügbaren Wörter
+    int foundWords = 0;
+
+    //suche horizontal
+    for(int i = 0; i < wordCount; i++){
+        for(int h = 0; h < MAX_SEARCH_FIELD_LEN; h++){
+            if(strstr(wordSalad[h], words[i]) != NULL){
+                foundWords++;
+                break;
+            }
+        }
+    }
+
+    //flip Board
+    char copySalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN];
+    for (int i = 0; i< MAX_SEARCH_FIELD_LEN; i++){
+        for (int j = 0; j < MAX_SEARCH_FIELD_LEN; j++){
+            copySalad[i][j] = wordSalad[j][i];
+        }
+    }
+
+    // sucher vertikal
+    for(int i = 0; i < wordCount; i++){
+        for(int h = 0; h < MAX_SEARCH_FIELD_LEN; h++){
+            if(strstr(copySalad[h], words[i]) != NULL){
+                foundWords++;
+                break;
+            }
+        }
+    }
+
+    if(foundWords == placedWords) return 0;
+    return -1;
+}
+
+>>>>>>> 61221a5b8ddad53683e9cad057577a9e8b9ea958
 int main(int argc, char *argv[])
 {
     int exitCode = EXIT_SUCCESS;
@@ -48,6 +87,7 @@ int main(int argc, char *argv[])
                 fprintf(stderr, "Fehler: Es konnten keine Wörter eingelesen werden (input.c Rückgabewert <= 0).\n");
                 exitCode = EXIT_FAILURE;
             }
+<<<<<<< HEAD
 
             // Prüfen, ob game.c (createWordSalad) einen Fehler zurückgegeben hat (<= 0) oder ob nicht alle eingelesenen Wörter platziert werden konnten
             else if (placedWords <= 0 || placedWords < wordCount)
@@ -64,6 +104,10 @@ int main(int argc, char *argv[])
                 // Übergabe an graphicalGame.c via startGame:
                 startGame(wordSalad, MAX_SEARCH_FIELD_LEN, words, placedWords, 400);    // Parameter: (wordSalad, searchFieldSize, words, numberOfWords, windowSize)
             }
+=======
+            //keine Ahnung wiegroß pixelSize sein soll
+            startGame(wordSalad, MAX_SEARCH_FIELD_LEN, words, placedWords, SALAD_SIZE * SALAD_SIZE);
+>>>>>>> 61221a5b8ddad53683e9cad057577a9e8b9ea958
         }
 
         else