update .gitignore

Reviewed-on: wiesendsi102436/info2Praktikum-Wortsalat#3

.gitignore

@@ -0,0 +1,10 @@
+wordsalad_initial
+game.o
+input.o
+runTests
+main.o
+graphicalGame.o
+wordsalad
+wordsalad_initial.exe
+runTests.exe
+.vscode

Start_Linux/game.c

@@ -13,11 +13,48 @@
 // Creates the word salad by placing words randomly and filling empty spaces
 int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount)
 {
+   // set seed for random number generator
+   srand(time(NULL));
 
+   int r, c;
+
+   //Gesamtes Feld auf 0 setzen
+   for (r=0; r < searchFieldLen; r++) { 
+      for (c=0; c < searchFieldLen; c++) {
+         salad [r][c] = EMPTY_CHAR;
+      }
+   }
+   
+   //Wörter zufällig horizontal oder vertikal platzieren
+   enum Richtung {HORIZONTAL,VERTIKAL}; //0;1
+   enum Richtung dir;
+   dir = (rand() % 2 == 0) ? HORIZONTAL : VERTIKAL;
+      //Schleife, die das Setzen für alle Wörter durchführt, Zufällig horizontal(0) oder vertikal(1), an zufällige Stelle
+      //Prüfen, ob das Wort von der Länge her ins Feld passt
+
+
+   //Felder, in denen keine Wörter stehen, werden mit zufälligen Buchstaben befüllt
+   for (r=0; r < searchFieldLen; r++) {
+      for (c=0; c < searchFieldLen; c++) {
+         if (salad[r][c] == EMPTY_CHAR) {
+           salad [r][c] = 'A' + (rand()% 26); 
+         }
+      }
+   }
+
+   return 0;
 }
 
 // Prints the word salad to console
 void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
 {
+   int r, c;
 
+   //Ausgabe des gesamten Feldes
+   for (r=0; r < searchFieldLen; r++) {
+      for (c=0; c < searchFieldLen; c++) {
+         printf("%c ", salad[r][c]);
+      }
+      printf("\n");
+   }
 }

Start_Linux/main.c

@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
     int exitCode = EXIT_SUCCESS;
 
     // Check if the correct number of arguments is provided
-    if(argc != 2)
+    if (argc != 2)
     {
         fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]);
         exitCode = EXIT_FAILURE;
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 
         FILE *file = fopen(argv[1], "r");
 
-        if(file != NULL)
+        if (file != NULL)
         {
             unsigned int placedWords = 0;
             char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad
@@ -36,11 +36,22 @@ int main(int argc, char *argv[])
             // Create the word salad by placing words into grid
             placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
 
-            // TODO:
             // Check if all words were successfully placed
-            // Start the game if successful
             // error message if some words couldn't be placed
+            if (placedWords < wordCount)
+            {
+                int notPlacedNum = wordCount - placedWords;
+                fprintf(stderr, "%d word(s) couldn't be placed\n", notPlacedNum);
+            }
 
+            // TODO:
+            // correct parameters for startGame
+
+            // Start the game if at least 1 word has been successfully placed
+            else if (placedWords >= 1)
+            {
+                startGame(wordSalad, 80, words, placedWords, 800);
+            }
         }
         else
         {

Start_Windows/game.c

@@ -13,11 +13,48 @@
 // Creates the word salad by placing words randomly and filling empty spaces
 int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount)
 {
+   // set seed for random number generator
+   srand(time(NULL));
 
+   int r, c, placedWords=0;
+
+   //Gesamtes Feld auf 0 setzen, am besten in eigene Fkt, dann aber extra Tests dafür erstellen
+   for (r=0; r < searchFieldLen; r++) { 
+      for (c=0; c < searchFieldLen; c++) {
+         salad [r][c] = EMPTY_CHAR;
+      }
+   }
+   
+   //Wörter zufällig horizontal oder vertikal platzieren
+   enum Richtung {HORIZONTAL,VERTIKAL}; //0;1
+   enum Richtung dir;
+   dir = (rand() % 2 == 0) ? HORIZONTAL : VERTIKAL;
+      //Schleife, die das Setzen für alle Wörter durchführt, Zufällig horizontal(0) oder vertikal(1), an zufällige Stelle
+      //Prüfen, ob das Wort von der Länge her ins Feld passt
+   
+
+   //Felder, in denen keine Wörter stehen, werden mit zufälligen Buchstaben befüllt, am besten in eigene Fkt, dann aber extra Tests dafür erstellen
+   for (r=0; r < searchFieldLen; r++) {
+      for (c=0; c < searchFieldLen; c++) {
+         if (salad[r][c] == EMPTY_CHAR) {
+           salad [r][c] = 'A' + (rand()% 26); 
+         }
+      }
+   }
+   //return "Anzahl platzierter Wörter", wird in Main dann mit soll verglichen
+   return placedWords;
 }
 
 // Prints the word salad to console
 void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
 {
+   int r, c;
 
+   //Ausgabe des gesamten Feldes
+   for (r=0; r < searchFieldLen; r++) {
+      for (c=0; c < searchFieldLen; c++) {
+         printf("%c ", salad[r][c]);
+      }
+      printf("\n");
+   }
 }

Start_Windows/main.c

@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
     int exitCode = EXIT_SUCCESS;
 
     // Check if the correct number of arguments is provided
-    if(argc != 2)
+    if (argc != 2)
     {
         fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]);
         exitCode = EXIT_FAILURE;
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 
         FILE *file = fopen(argv[1], "r");
 
-        if(file != NULL)
+        if (file != NULL)
         {
             unsigned int placedWords = 0;
             char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad
@@ -36,11 +36,22 @@ int main(int argc, char *argv[])
             // Create the word salad by placing words into grid
             placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
 
-            // TODO:
             // Check if all words were successfully placed
-            // Start the game if successful
             // error message if some words couldn't be placed
+            if (placedWords < wordCount)
+            {
+                int notPlacedNum = wordCount - placedWords;
+                fprintf(stderr, "%d word(s) couldn't be placed\n", notPlacedNum);
+            }
 
+            // TODO:
+            // correct parameters for startGame
+
+            // Start the game if at least 1 word has been successfully placed
+            else if (placedWords >= 1)
+            {
+                startGame(wordSalad, 80, words, placedWords, 800);
+            }
         }
         else
         {