Merge branch 'my-changes' of https://git.efi.th-nuernberg.de/gitea/shobayoeniolasi99076/info2Praktikum-ES into my-changes

Start_Linux/game.c

@@ -25,6 +25,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
     }
 
     // Platzieren der Wörter
+    unsigned int placedWords = 0;
     for (unsigned int w = 0; w < wordCount; ++w) {
         const char *word = words[w];
         size_t wordLen = strlen(word);
@@ -34,7 +35,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
 
         int placed = 0;
         for (int attempts = 0; attempts < MAX_RAND_TRIES_PER_WORD && !placed; ++attempts) {
-            int vertical = rand() % 2; // 0=horizontal, 1=vertical
+            int vertical = rand() % 2; // 0=horizontal, 1=vertikal
             unsigned int row, col;
 
             if (vertical) {
@@ -69,9 +70,8 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
             placed = 1;
         }
 
-        if (!placed) {
+        if (placed) {
-            // Ein Wort konnte nicht platziert werden, Abbruch möglich
+            placedWords++;
-            return 0;
         }
     }
 
@@ -84,7 +84,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
         }
     }
 
-    return 1;
+    return placedWords;
 }
 
 // Prints the word salad to console

Start_Linux/input.c

@@ -1,6 +1,7 @@
 #include "input.h"
 #include <string.h>
 #include <ctype.h>
+#include <stdlib.h>
 
 // TODO:
 // eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
@@ -11,19 +12,23 @@ char* readWord(FILE *file)
     int c;                      // Variable für jedes gelesene Zeichen
 
     // Whitespace und Delimiters überspringen
-    while((c = fgetc(file)) != EOF && (isspace(c) || c == ',' || c == ';' || c == '.'));
+    while ((c = fgetc(file)) != EOF && (isspace((unsigned char)c) || c == ',' || c == ';' || c == '.'));
+
+    if (c == EOF) {
+        return NULL;
+    }
 
     // Buchstaben einlesen bis nächstes whitespace/Delimiter/EOF
-    while(c != EOF && !isspace(c) && c != ',' && c != ';' && c != '.' && index < MAX_WORD_LEN - 1)      //-1 wegen Nullterminator
+    while (c != EOF && !isspace((unsigned char)c) && c != ',' && c != ';' && c != '.' && index < MAX_WORD_LEN - 1)      //-1 wegen Nullterminator
     {
-        word[index++] = (char)toupper(c);  // Konvertiere zu Großbuchstaben
+        word[index++] = (char)toupper((unsigned char)c);  // Konvertiere zu Großbuchstaben
         c = fgetc(file);
     }
     word[index] = '\0'; // Nullterminator (= Ende String)
 
-    // Leere überspringen
+    if (index == 0) {
-    if(index == 0)
         return NULL;
+    }
 
     return strdup(word); // Rückgabe string, dynamisch allokiert da Zeiger auf lokalen Puffer zurückgegeben
 }

Start_Linux/makefile

@@ -1,45 +1,42 @@
 CC = gcc
-CFLAGS = -g -Wall
+CFLAGS = -g -Wall -Wextra
-LDFLAGS = -lGL -lX11 -lm
+CPPFLAGS = -I$(raylibfolder) -I$(unityfolder)
-BINARIES = ./linux
+LDFLAGS =
+LDLIBS = -lGL -lX11 -lm
 
+BINARIES = ./linux
 raylibfolder = ./raylib
 unityfolder = ./unity
 
-# --------------------------
+TARGET = wordsalad
-# initiales Spiel bauen
-# --------------------------
-wordsalad_ourversion:
-	$(CC) -o wordsalad_ourversion -L. $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS)
-
-# --------------------------
-# Normales Spiel bauen
-# --------------------------
-wordsalad: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a
-	$(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS)
-
-main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
-
-input.o: input.c
-	$(CC) $(CFLAGS) -c input.c
-
-game.o: game.c
-	$(CC) $(CFLAGS) -c game.c
-
-graphicalGame.o: graphicalGame.c
-	$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c
-
-# --------------------------
-# Unit Tests
-# --------------------------
 TEST_BIN = runTests
 
+OBJS = main.o input.o game.o graphicalGame.o
+
+.PHONY: all clean test
+
+all: $(TARGET)
+
+wordsalad_ourversion: main.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a
+	$(CC) $(CFLAGS) -o $@ main.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDLIBS)
+
+$(TARGET): $(OBJS) $(BINARIES)/libraylib.a
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(BINARIES)/libraylib.a $(LDLIBS)
+
+main.o: main.c input.h game.h graphicalGame.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+input.o: input.c input.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+game.o: game.c game.h input.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+graphicalGame.o: graphicalGame.c graphicalGame.h game.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
 test: input.o game.o unit_tests.c
-	$(CC) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
 
-# --------------------------
-# Clean
-# --------------------------
 clean:
-	rm -f *.o wordsalad $(TEST_BIN)
+	rm -f *.o $(TARGET) $(TEST_BIN) wordsalad_ourversion