merge upstream

Start_Windows/game.c

@@ -6,18 +6,115 @@
 #define MAX_RAND_TRIES_PER_WORD 10
 #define EMPTY_CHAR 0
 
-//TODO: Spiellogik implementieren:
+// TODO: Spiellogik implementieren:
 /* * Wörter aus der Wortliste zufällig horizontal oder vertikal platzieren
-   * restliche Felder mit zufälligen Buchstaben füllen */
+ * restliche Felder mit zufälligen Buchstaben füllen */
 
 // 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)
 {
-Printf("Hello World+1");
+   srand(time(NULL));
+   // wipe field
+   int placedWords = 0;
+   for (int i = 0; i < searchFieldLen; i++)
+   {
+      for (int j = 0; j < searchFieldLen ; j++)
+         salad[i][j] = EMPTY_CHAR;
+   }
+   // place Words
+   for (int wordNumber = 0; wordNumber < wordCount; wordNumber++)
+   {
+      int wordlength = strlen(words[wordNumber]);
+
+      int placed = 0;
+
+      for (int try = 0; (try < MAX_RAND_TRIES_PER_WORD) && !placed; try++)
+      {
+         int horizontal = rand() % 2; // 0 vertikal --> 1 horizontal
+
+         int x = rand() % searchFieldLen;
+         int y = rand() % searchFieldLen;
+
+         if (horizontal)
+         {
+            if (x + wordlength > searchFieldLen) // word does not fit
+            {
+               continue;
+            }
+
+            int fits = 1;
+
+            for (int i = 0; i < wordlength; i++) // position already occupied by other word
+            {
+               if (salad[y][x + i] != EMPTY_CHAR)
+               {
+                  fits = 0;
+                  break;
+               }
+            }
+
+            if (fits)
+            {
+               for (int i = 0; i < wordlength; i++)
+               {
+                  salad[y][x + i] = words[wordNumber][i];
+               }
+               placed = 1;
+               placedWords++;
+            }
+         }
+         else
+         {
+            if ((y + wordlength) > searchFieldLen)
+            {
+               continue;
+            }
+
+            int fits = 1;
+
+            for (int i = 0; i < wordlength; i++) // position already occupied by other word
+            {
+               if (salad[y + i][x] != EMPTY_CHAR)
+               {
+                  fits = 0;
+                  break;
+               }
+            }
+            if (fits)               
+            {
+               for (int i = 0; i < wordlength; i++)
+               {
+                  salad[y + i][x] = words[wordNumber][i];
+               }
+               placed = 1;
+               placedWords++;
+            }
+         }
+      }
+   }
+   // fill rest with random characters
+
+   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';     // 90 ist Z in ASCII und A ist 65
+         }
+      }
+   }
+   return placedWords;
 }
 
 // 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]);
+      }
+   }
 }

Start_Windows/input.c

@@ -8,10 +8,10 @@
 // Read words from file and store in 'words' array
 int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
 {
-    //kein fopen und close nötig, weil dies schon in der main passiert und mit *file übergeben wird//
+    //kein fopen und fclose nötig, weil dies schon in der main passiert und mit *file übergeben wird//
 
 
-if (!file)
+if (file == NULL)
 {
     perror("Error invalid pointer to file");
     return -1;
@@ -20,13 +20,18 @@ if (!file)
 char line[1024];
 unsigned int count = 0;
 
-while (fgets(line, sizeof(line), file) && count < maxWordCount)
+while (fgets(line, sizeof(line), file) && (count < maxWordCount))
 {
     line[strcspn(line, "\n")] = '\0';
 
     char *token = strtok(line, " ;,");
-while (token && count < maxWordCount)
+while (token && (count < maxWordCount))
 {
+    for (int i = 0; token[i] != '\0'; i++)
+    {
+        token[i] = toupper(token[i]);
+    }
+    
     strcpy(words[count], token);
     count++;
     token = strtok(NULL, " ;,");

Start_Windows/makefile

@@ -6,6 +6,12 @@ BINARIES = ./windows
 raylibfolder = ./raylib
 unityfolder = ./unity
 
+# --------------------------
+# my version
+# --------------------------
+wordsalad_myversion: main.o graphicalGame.o
+	$(CC) main.o graphicalGame.o -o wordsalad_myversion $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS)
+
 # --------------------------
 # initiales Spiel bauen
 # --------------------------