1 Commits
Author SHA1 Message Date
Angelos 138aa9b820 Fix: Makefile baut immer unsere Version(kein fertiges Spiel mehr 2026-10-18 19:09:25 +02:00
4 changed files with 3 additions and 127 deletions

No files matched your search

-102
View File
@@ -14,106 +14,4 @@
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((unsigned int)time(NULL));
for (unsigned int row = 0; row < searchFieldLen; row++)
{
for (unsigned int col = 0; col < searchFieldLen; col++)
{
salad[row][col] = EMPTY_CHAR; // Initialize all cells to empty
}
}
unsigned int placedWords = 0;
// 2. Alle Wörter nacheinander platzieren
for (unsigned int i = 0; i < wordCount; i++)
{
unsigned int wordLen = strlen(words[i]);
int placed = 0;
// Wort darf nicht länger als das Spielfeld sein
if (wordLen == 0 || wordLen > searchFieldLen)
{
continue;
}
for (unsigned int attempt = 0; attempt < MAX_RAND_TRIES_PER_WORD && !placed; attempt++)
{
unsigned int startRow = 0;
unsigned int startCol = 0;
unsigned int direction = rand() % 2;
if (direction == 0) // Horizontal
{
startRow = rand() % searchFieldLen;
startCol = rand() % (searchFieldLen - wordLen + 1);
}
else // Vertikal
{
startRow = rand() % (searchFieldLen - wordLen + 1);
startCol = rand() % searchFieldLen;
}
// 3. Überprüfen, ob das Wort an der gewählten Position platziert werden kann
int canPlace = 1;
for (unsigned int j = 0; j < wordLen; j++)
{
if (direction == 0) // Horizontal
{
if (salad[startRow][startCol + j] != EMPTY_CHAR && salad[startRow][startCol + j] != words[i][j])
{
canPlace = 0;
break;
}
}
else // Vertikal
{
if (salad[startRow + j][startCol] != EMPTY_CHAR && salad[startRow + j][startCol] != words[i][j])
{
canPlace = 0;
break;
}
}
}
if (canPlace)
{
// Wort platzieren
for (unsigned int j = 0; j < wordLen; j++)
{
if (direction == 0) // Horizontal
{
salad[startRow][startCol + j] = words[i][j];
}
else // Vertikal
{
salad[startRow + j][startCol] = words[i][j];
}
}
placedWords++;
}
placed = 1; // Mark as placed to exit the attempt loop
}
}
// 4. Restliche Felder mit zufälligen Buchstaben füllen
for (unsigned int row = 0; row < searchFieldLen; row++)
{
for (unsigned int col = 0; col < searchFieldLen; col++)
{
if (salad[row][col] == EMPTY_CHAR)
{
salad[row][col] = 'A' + (rand() % 26); // Zufälliger Buchstabe von A-Z
}
}
}
printf("Placed %u words out of %u\n", placedWords, wordCount);
return placedWords; // Return the number of successfully placed words
}
-22
View File
@@ -1,22 +0,0 @@
#include <stdio.h>
#include "game.h"
int main(void)
{
char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN];
const char words[][MAX_WORD_LEN] = {
"HALLO",
"WELT",
"AUTO"
};
unsigned int wordCount = sizeof(words) / sizeof(words[0]);
int placedWords = createWordSalad(salad, MAX_SEARCH_FIELD_LEN, words, wordCount);
printf("Placed words: %d\n", placedWords);
return 0;
}
+2 -2
View File
@@ -43,8 +43,8 @@ graphicalGame.o: $(codefolder)/graphicalGame.c
# --------------------------
# mein Spiel bauen
#---------------------------
wordsalad_myversion: main.o
$(CC) -o wordsalad_myversion main.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS)
wordsalad_myversion: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a
$(CC) $(CFLAGS) -o wordsalad_myversion main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS)
# --------------------------
+1 -1
View File
@@ -27,7 +27,7 @@ void print_test_result(int result) {
printf(RED "FAILED\n" RESET);
}
}
// ---------- Tests für input.c ----------
void test_readWords_simple(void) {
FILE *f = fopen("testwords_simple.txt", "r");