update game.c

Start_Windows/game.c

@@ -2,7 +2,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
-//#include <ctype.h>
+#include <ctype.h>
 
 
 #define MAX_RAND_TRIES_PER_WORD 10
@@ -107,50 +107,13 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
             }  
          }
       }
-
-/*
-         
-   //Wort in Wortsalat schreiben
-         if(check_direction == 1 && check_overlap == 0 && tries < MAX_RAND_TRIES_PER_WORD)
-            {
-               for(int i_set = 0; i_set < len; i_set++)
-               {
-                  if (direction == 0)  // 0 = VERTIKAL
-                  {
-                  salad[zeile + i_set][spalte] = words[num_words][i_set];
-                  placedWords++;
-                  }
-
-                  if (direction == 1)  // 1 = HORIZONTAL 
-                  {
-                  salad[zeile][spalte + i_set] = words[num_words][i_set];
-                  placedWords++;
-                  }
-               }
-            }
-      }
-   }
-   
-   // fügt zufällige Buchstaben ein
-   for(int l = 0; l < searchFieldLen; l++){
-      for(int m = 0; m < searchFieldLen; m++ ){
-         if(isalpha(salad[l][m]) == 0 ){
-            // zufällige Buchstaben erzeugen
-            char alphabet [] = "abcdefghijklmnopqrstuvwxyz";
-            int laenge = strlen(alphabet);
-            int zufallszahl = rand()% laenge;
-            char zufallsbuchstabe = alphabet[zufallszahl];
-            // zufällige Buchstaben einfügen
-            salad[l][m] = zufallsbuchstabe; 
-         }
-      }
-   } 
-*/
    }
    return placedWords; //platzierte Wörter zurückgeben
-   
 }
 
+
+
+
 // Prints the word salad to console
 void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
 {

Start_Windows/main.c

@@ -1,64 +1,99 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include "input.h"
 #include "game.h"
-#include "graphicalGame.h"
+#include <time.h>
+#include <stdlib.h>
+#include <string.h>
 
-#define MAX_NUMBER_OF_WORDS 100
-#define SALAD_SIZE 20
+#define MAX_RAND_TRIES_PER_WORD 10
+#define EMPTY_CHAR 0
 
-int main(int argc, char *argv[])
-{
-    int exitCode = EXIT_SUCCESS;
 
-    // Check if the correct number of arguments is provided
-    if(argc != 2)
-    {
-        fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]);
-        exitCode = EXIT_FAILURE;
-    }
-    else
-    {
-        char words[MAX_NUMBER_OF_WORDS][MAX_WORD_LEN]; // Array to hold the words to be used in the game
-        unsigned int wordCount = 0;
 
-        FILE *file = fopen(argv[1], "r");
+//TODO: Spiellogik implementieren:
+/* * Wörter aus der Wortliste zufällig horizontal oder vertikal platzieren
+   * restliche Felder mit zufälligen Buchstaben füllen */
 
-        if(file != NULL)
-        {
-            unsigned int placedWords = 0;
-            char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad
+// 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) {
+   int addedWords = 0;
+   int attempts = 0; //Anzahl an Versuchen ein Wort hinzuzufügen
+   int added = 0; //0 Wort nicht hinzugefügt , 1 Wort hinzugefügt
+   int space = 1; // 0 Wort zu lang, 1 Wort passt an diese Stelle
+   unsigned long long wordLength = 0;
 
-            // Read words from file and store in 'words' array
-            wordCount = readWords(file, words, MAX_NUMBER_OF_WORDS);
-            fclose(file);
+   for (int i = 0; i < searchFieldLen; i++) {
+      for (int j = 0; j < searchFieldLen; j++) {
+         salad[i][j] = EMPTY_CHAR; //Füllen des gesamten Arrays mit Nullen
+      }
+   }
+   for (int i=0; i < wordCount; i++) {
 
-            // Create the word salad by placing words into grid
-            placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
+      wordLength = strlen(words[i]);
 
-            // 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
-
-            if (placedWords == wordCount){
-                startGame(wordSalad, SALAD_SIZE, words, wordCount, 750);
+      while (attempts <= MAX_RAND_TRIES_PER_WORD && added != 1) {
+         int direction = rand() % 2;// 0 Horizontal, 1 Vertikal
+         if (direction == 0) {
+            int collumn = rand() % searchFieldLen;
+            int row = rand() % searchFieldLen;
+            for (int j = 0; j < wordLength; j++)
+            {
+               if (salad[row][collumn+j] != EMPTY_CHAR) {space = 0; break;}
+               //Prüfen ob das Wort ein bereits vorhandenes Wort überspeichern würde
             }
-            else{
-                printf("Error. The words couldn't be placed.\n");
-                return -1;
+            if ((collumn + wordLength >= searchFieldLen-1) || (space == 0)) {attempts++;}
+            //Prüfen ob Wort an der Stelle (Zeile, Spalte) in das Array passt
+            else {for (int j = 0; j < wordLength; j++)
+            {
+               salad[row][collumn+j] = words[i][j]; //Einfügen des Wortes Buchstabe für Buchstabe
             }
+            added=1;
+            addedWords++;
 
-        }
-        else
-        {
-            // Print error message if file couldn't be opened
-            fprintf(stderr, "Could not open file %s for reading ...\n", argv[1]);
-            exitCode = EXIT_FAILURE;
-        }
-    }
+         }
+         }
+         else if (direction == 1) {// Vertikal funktioniert analog zu horizontal
+            int collumn = rand() % searchFieldLen;
+            int row = rand() % searchFieldLen;
+            for (int j = 0; j < wordLength; j++)
+            {
+               if (salad[row+j][collumn] != EMPTY_CHAR) {space = 0; break;}
+            }
+            if ((row + wordLength >= searchFieldLen-1) || (space == 0)) {attempts++;}
+            else {
+               for (int j = 0; j < wordLength; j++)
+               {
+                  salad[row+j][collumn] = words[i][j];
+               }
+               added=1;
+               addedWords++;
+            }
+            }
+         space = 1;
+      }
+      attempts = 0;
+      added = 0;
 
-    return exitCode;
+   }
+   for (int i = 0; i < searchFieldLen; i++) {
+      for (int j = 0; j < searchFieldLen; j++) {
+         if (salad[i][j] == EMPTY_CHAR)
+         {
+            salad[i][j] = rand()%('Z'-'A'+1)+'A';//Alle Felder, die noch nicht befüllt sind, werden zufällig befüllt
+
+         }
+
+      }
+   }
+   return addedWords;
 }
 
-//
+// Prints the word salad to console
+void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
+{
+   for(int i = 0; i < searchFieldLen; i++)
+   {
+      for(int j = 0; j < searchFieldLen; j++)
+      {
+         printf("%c", salad[i][j]);//Ausgabe des Arrays auf die Konsole
+      }
+   }
+}