Remove TODO comments for game logic implementation in game.c

.gitignore

@@ -1 +1,6 @@
-Start_Linux/wordsalad_initial
+wordsalad_initial
+runTests
+.vscode
+*.o
+*.exe
+wordsalad

Start_Linux/game.c

@@ -2,22 +2,117 @@
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 
 #define MAX_RAND_TRIES_PER_WORD 10
 #define EMPTY_CHAR 0
 
-//TODO: Spiellogik implementieren:
-/* * Wörter aus der Wortliste zufällig horizontal oder vertikal platzieren
-   * 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)
 {
+   srand(time(NULL));
+   //Fill salad with empty_char
+   for(int i = 0; i < searchFieldLen; i++){
+      for(int j = 0; j < searchFieldLen; j++){
+         salad[i][j] = EMPTY_CHAR;
+      }
+   }
+
+   int wordsPlaced = 0;  //Track number of words successfully placed
+   
+   //Try to place each word
+   for(int w = 0; w < wordCount; w++){
+      int wordLen = strlen(words[w]);
+      int placed = 0;
+      
+      if(wordLen > searchFieldLen){
+         //printf("Word %s is too long!\n", words[w]);
+         break;
+      }
+      //Try multiple times to find a valid position
+      for(int attempt = 0; attempt < MAX_RAND_TRIES_PER_WORD && !placed; attempt++){
+         //Random orientation: 0 = horizontal, 1 = vertical
+         int orientation = rand() % 2;
+         int row, col;
+         
+         if(orientation == 0){ //Horizontal
+            row = rand() % searchFieldLen;
+            col = rand() % (searchFieldLen - wordLen + 1); //Ensure word fits
+            
+            //Check if position is free
+            int canPlace = 1;
+            for(int i = 0; i < wordLen; i++){
+               if(salad[row][col + i] != EMPTY_CHAR && salad[row][col + i] != words[w][i]){
+                  canPlace = 0;
+                  break;
+               }
+            }
+            
+            //Place word
+            if(canPlace){
+               for(int i = 0; i < wordLen; i++){
+                  salad[row][col + i] = words[w][i];
+               }
+               placed = 1;
+               wordsPlaced++;
+            }
+         }
+         else{ //Vertical
+            row = rand() % (searchFieldLen - wordLen + 1); //Ensure word fits
+            col = rand() % searchFieldLen;
+            
+            //Check if position is free
+            int canPlace = 1;
+            for(int i = 0; i < wordLen; i++){
+               if(salad[row + i][col] != EMPTY_CHAR && salad[row + i][col] != words[w][i]){
+                  canPlace = 0;
+                  break;
+               }
+            }
+            
+            //Place word if position is valid
+            if(canPlace){
+               for(int i = 0; i < wordLen; i++){
+                  salad[row + i][col] = words[w][i];
+               }
+               placed = 1;
+               wordsPlaced++;
+            }
+         }
+      }
+   }
+   
+   //Fill remaining empty cells with random letters
+   for(int i = 0; i < searchFieldLen; i++){
+      for(int j = 0; j < searchFieldLen; j++){
+         if(salad[i][j] == EMPTY_CHAR){
+            salad[i][j] = 'A' + (rand() % 26);
+         }
+      }
+   }
+   
+   return wordsPlaced;
+   
+
 
 }
 
 // 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]);
+      }
+      puts("\n");
+   }
 }
+
+
+//Fill up Word salad
+void fillWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]){
+   
+}
+

Start_Linux/input.c

@@ -1,12 +1,69 @@
+/* 
+----- input.c-------------------------------------------------------- 
+ Description: ReadWords: Takes a file and separates all the words from one another, returns the wordcount and an array with all words
+     Project: Praktikum Informatik 2
+      Author: kobma99134@th-nuernberg.de
+        Date: 05-11-2025
+------------------------------------------------------------------------- 
+*/
+
 #include "input.h"
 #include <string.h>
 #include <ctype.h>
 
-// TODO:
-// eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
-
 // Read words from file and store in 'words' array
 int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
 {
+    // checks, if the file acually exists
+    if (file == NULL) {
+        return 0;
+    }
 
+    //return value: wordcount, as in the number of words that are being read
+    int wordcount = 0;
+    char readLine[MAX_LINE_LEN];
+
+    // collects the words line by line and adds them to the list, if its not exceeding the max word count
+    while (fgets(readLine, sizeof(readLine), file) != NULL && (wordcount < maxWordCount)) {
+        
+        char word[MAX_WORD_LEN];
+        int wordIndex = 0;
+        
+        //reads every character in the line from start to finish, until the Enter key ('\0')
+        for (int i = 0; readLine[i] != '\0'; i++) {
+            
+            // is the character a letter from the alphabet?
+            if(isalpha(readLine[i])) {
+                if (wordIndex < MAX_WORD_LEN) {
+                    // clean code: We want only uppercase or only lowercase letters to avoid future problems...
+                    word[wordIndex++] = toupper(readLine[i]);
+                }
+            }
+            else {
+                //if its not a letter, it has to be another character dividing two words e.g. ' ', ',', ';' etc.
+                if (wordIndex > 0) {
+                    // we want a full word, not an empty string
+                    word[wordIndex] = '\0';
+                    // add the word to the wordlist
+                    strcpy(words[wordcount], word);
+                    wordcount++;
+                    wordIndex = 0;
+
+                    if (wordcount >= maxWordCount) {
+                        return wordcount;
+                    }
+                }
+            }
+        }
+
+        //Edge case: If the last word ends on a '\0', right after the last letter
+        if (wordIndex > 0 && wordcount < maxWordCount) {
+            word[wordIndex] = '\0';
+            strcpy(words[wordcount], word);
+            wordcount++;
+        }
+
+    }
+    // regular case: return the total number of words
+    return wordcount;
 }

Start_Linux/main.c

@@ -7,6 +7,7 @@
 #define MAX_NUMBER_OF_WORDS 100
 #define SALAD_SIZE 20
 
+
 int main(int argc, char *argv[])
 {
     int exitCode = EXIT_SUCCESS;
@@ -32,14 +33,19 @@ int main(int argc, char *argv[])
             // Read words from file and store in 'words' array
             wordCount = readWords(file, words, MAX_NUMBER_OF_WORDS);
             fclose(file);
-
+            
             // 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){
+                printf("%d Words didn't fit!\n", wordCount-placedWords);
+                return -1;
+            }
+
+            showWordSalad(wordSalad, SALAD_SIZE);
+            
+
+            startGame(wordSalad, SALAD_SIZE, words, wordCount, 600);
 
         }
         else

Start_Linux/makefile

@@ -6,12 +6,6 @@ BINARIES = ./linux
 raylibfolder = ./raylib
 unityfolder = ./unity
 
-# --------------------------
-# initiales Spiel bauen
-# --------------------------
-wordsalad_initial:
-	$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
-
 # --------------------------
 # Normales Spiel bauen
 # --------------------------
@@ -30,6 +24,13 @@ game.o: game.c
 graphicalGame.o: graphicalGame.c
 	$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c
 
+
+# --------------------------
+# initiales Spiel bauen
+# --------------------------
+wordsalad_initial:
+	$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
+
 # --------------------------
 # Unit Tests
 # --------------------------
@@ -38,6 +39,7 @@ TEST_BIN = runTests
 test: input.o game.o unit_tests.c
 	$(CC) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
 
+
 # --------------------------
 # Clean
 # --------------------------

todo.md

@@ -0,0 +1,13 @@
+## Todo
+#### game.c
+_Vorgegebene Anweisung:_
+Wörter aus der Wortliste zufällig horizontal oder vertikal plazieren, restliche Felder mit zufälligen Buchstaben füllen  
+#### input.c
+_Vorgegebene Anweisung:_  
+eine Funktion implementierenm die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt  
+=> Die Methode sollte Fertig sein, ist aber noch nicht getestet.
+#### main.c
+_Vorgegebene Anweisung:_  
+Check if all words were successfully placed  
+start the game if successfull  
+error message if some words couldn't be placed