Start_Linux/game.c

@@ -8,6 +8,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)
 {
@@ -26,10 +30,6 @@ 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 +49,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
                }
             }
             
-            //Place word
+            // Place word if position is valid
             if(canPlace){
                for(int i = 0; i < wordLen; i++){
                   salad[row][col + i] = words[w][i];
@@ -92,24 +92,21 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
       }
    }
    
-   return wordsPlaced;
+   return wordsPlaced;  // Return number of words successfully placed
    
 
 
 }
 
 // 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");
+         puts(salad[i][j]);
+      }
    }
 }
-
 
 //Fill up Word salad
 void fillWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]){

Start_Linux/input.c

@@ -1,69 +1,60 @@
-/* 
------ 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];
+    int wordCount = 0;
+    char buffer[1024]; // Buffer for reading lines
     
-    // 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];
+    // Read file line by line
+    while(fgets(buffer, sizeof(buffer), file) != NULL && wordCount < maxWordCount) {
+        // Process each character in the line
+        char currentWord[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++) {
+        for(int i = 0; buffer[i] != '\0'; i++) {
+            char c = buffer[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]);
+            // Check if character is a letter
+            if(isalpha(c)) {
+                // Convert to uppercase and add to current word
+                if(wordIndex < MAX_WORD_LEN - 1) {
+                    currentWord[wordIndex++] = toupper(c);
                 }
             }
             else {
-                //if its not a letter, it has to be another character dividing two words e.g. ' ', ',', ';' etc.
+                // Non-letter character = word delimiter
                 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++;
+                    // We have a complete word
+                    currentWord[wordIndex] = '\0';
+                    strcpy(words[wordCount], currentWord);
+                    wordCount++;
                     wordIndex = 0;
                     
-                    if (wordcount >= maxWordCount) {
-                        return wordcount;
+                    // Check if we've reached max word count
+                    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++;
+        // Handle last word in line if it doesn't end with delimiter
+        if(wordIndex > 0 && wordCount < maxWordCount) {
+            currentWord[wordIndex] = '\0';
+            strcpy(words[wordCount], currentWord);
+            wordCount++;
+        }
     }
     
-    }
-    // regular case: return the total number of words
-    return wordcount;
+    return wordCount;
 }

Start_Linux/main.c

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

todo.md

@@ -5,7 +5,6 @@ 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