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

Start_Linux/game.c

@@ -30,6 +30,10 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
       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
@@ -49,7 +53,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
                }
             }
             
-            // Place word if position is valid
+            //Place word
             if(canPlace){
                for(int i = 0; i < wordLen; i++){
                   salad[row][col + i] = words[w][i];
@@ -92,22 +96,25 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
       }
    }
    
-   return wordsPlaced;  // Return number of words successfully placed
+   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++){
-         puts(salad[i][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,60 +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;
     }
 
-    int wordCount = 0;
+    //return value: wordcount, as in the number of words that are being read
-    char buffer[1024]; // Buffer for reading lines
+    int wordcount = 0;
+    char readLine[MAX_LINE_LEN];
 
-    // Read file line by line
+    // collects the words line by line and adds them to the list, if its not exceeding the max word count
-    while(fgets(buffer, sizeof(buffer), file) != NULL && wordCount < maxWordCount) {
+    while (fgets(readLine, sizeof(readLine), file) != NULL && (wordcount < maxWordCount)) {
-        // Process each character in the line
+        
-        char currentWord[MAX_WORD_LEN];
+        char word[MAX_WORD_LEN];
         int wordIndex = 0;
         
-        for(int i = 0; buffer[i] != '\0'; i++) {
+        //reads every character in the line from start to finish, until the Enter key ('\0')
-            char c = buffer[i];
+        for (int i = 0; readLine[i] != '\0'; i++) {
             
-            // Check if character is a letter
+            // is the character a letter from the alphabet?
-            if(isalpha(c)) {
+            if(isalpha(readLine[i])) {
-                // Convert to uppercase and add to current word
+                if (wordIndex < MAX_WORD_LEN) {
-                if(wordIndex < MAX_WORD_LEN - 1) {
+                    // clean code: We want only uppercase or only lowercase letters to avoid future problems...
-                    currentWord[wordIndex++] = toupper(c);
+                    word[wordIndex++] = toupper(readLine[i]);
                 }
             }
             else {
-                // Non-letter character = word delimiter
+                //if its not a letter, it has to be another character dividing two words e.g. ' ', ',', ';' etc.
                 if (wordIndex > 0) {
-                    // We have a complete word
+                    // we want a full word, not an empty string
-                    currentWord[wordIndex] = '\0';
+                    word[wordIndex] = '\0';
-                    strcpy(words[wordCount], currentWord);
+                    // add the word to the wordlist
-                    wordCount++;
+                    strcpy(words[wordcount], word);
+                    wordcount++;
                     wordIndex = 0;
 
-                    // Check if we've reached max word count
+                    if (wordcount >= maxWordCount) {
-                    if(wordCount >= maxWordCount) {
+                        return wordcount;
-                        return wordCount;
                     }
                 }
             }
         }
 
-        // Handle last word in line if it doesn't end with delimiter
+        //Edge case: If the last word ends on a '\0', right after the last letter
-        if(wordIndex > 0 && wordCount < maxWordCount) {
+        if (wordIndex > 0 && wordcount < maxWordCount) {
-            currentWord[wordIndex] = '\0';
+            word[wordIndex] = '\0';
-            strcpy(words[wordCount], currentWord);
+            strcpy(words[wordcount], word);
-            wordCount++;
+            wordcount++;
-        }
         }
 
-    return wordCount;
+    }
+    // regular case: return the total number of words
+    return wordcount;
 }

Start_Linux/main.c

@@ -5,7 +5,8 @@
 #include "graphicalGame.h"
 
 #define MAX_NUMBER_OF_WORDS 100
-#define SALAD_SIZE 20
+#define SALAD_SIZE 10
+
 
 int main(int argc, char *argv[])
 {
@@ -36,10 +37,13 @@ int main(int argc, char *argv[])
             // Create the word salad by placing words into grid
             placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
 
-            // TODO:
+            if(placedWords < wordCount){
-            // Check if all words were successfully placed
+                printf("%d Words didn't fit!\n", wordCount-placedWords);
-            // Start the game if successful
+                return -1;
-            // error message if some words couldn't be placed
+            }
+
+            showWordSalad(wordSalad, SALAD_SIZE);
+            
 
             startGame(wordSalad, SALAD_SIZE, words, wordCount, 600);
 

todo.md

@@ -5,6 +5,7 @@ Wörter aus der Wortliste zufällig horizontal oder vertikal plazieren, restlich
 #### 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