Compare commits
No commits in common. "my-changes" and "main" have entirely different histories.
my-changes
...
main
@ -13,95 +13,11 @@
|
||||
// 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)
|
||||
{
|
||||
if (searchFieldLen == 0 || searchFieldLen > MAX_SEARCH_FIELD_LEN) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Start with empty field
|
||||
for (unsigned int r = 0; r < searchFieldLen; ++r) {
|
||||
for (unsigned int c = 0; c < searchFieldLen; ++c) {
|
||||
salad[r][c] = EMPTY_CHAR;
|
||||
}
|
||||
}
|
||||
|
||||
// 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);
|
||||
if (wordLen == 0 || wordLen > searchFieldLen) {
|
||||
continue;
|
||||
}
|
||||
|
||||
int placed = 0;
|
||||
for (int attempts = 0; attempts < MAX_RAND_TRIES_PER_WORD && !placed; ++attempts) {
|
||||
int vertical = rand() % 2; // 0=horizontal, 1=vertikal
|
||||
unsigned int row, col;
|
||||
|
||||
if (vertical) {
|
||||
row = rand() % (searchFieldLen - wordLen + 1);
|
||||
col = rand() % searchFieldLen;
|
||||
} else {
|
||||
row = rand() % searchFieldLen;
|
||||
col = rand() % (searchFieldLen - wordLen + 1);
|
||||
}
|
||||
|
||||
// Check if placeable
|
||||
int ok = 1;
|
||||
for (size_t i = 0; i < wordLen; ++i) {
|
||||
unsigned int r = row + (vertical ? i : 0);
|
||||
unsigned int c = col + (vertical ? 0 : i);
|
||||
char current = salad[r][c];
|
||||
if (current != EMPTY_CHAR && current != word[i]) {
|
||||
ok = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!ok) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Set letters
|
||||
for (size_t i = 0; i < wordLen; ++i) {
|
||||
unsigned int r = row + (vertical ? i : 0);
|
||||
unsigned int c = col + (vertical ? 0 : i);
|
||||
salad[r][c] = word[i];
|
||||
}
|
||||
placed = 1;
|
||||
}
|
||||
|
||||
if (placed) {
|
||||
placedWords++;
|
||||
}
|
||||
}
|
||||
|
||||
// Rest mit zufälligen Buchstaben füllen
|
||||
for (unsigned int r = 0; r < searchFieldLen; ++r) {
|
||||
for (unsigned int c = 0; c < searchFieldLen; ++c) {
|
||||
if (salad[r][c] == EMPTY_CHAR) {
|
||||
salad[r][c] = 'A' + (rand() % 26);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return placedWords;
|
||||
}
|
||||
|
||||
// Prints the word salad to console
|
||||
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
|
||||
{
|
||||
for (unsigned int r = 0; r < searchFieldLen; ++r) {
|
||||
for (unsigned int c = 0; c < searchFieldLen; ++c) {
|
||||
char ch = salad[r][c];
|
||||
if (ch == EMPTY_CHAR) {
|
||||
ch = '.';
|
||||
}
|
||||
putchar(ch);
|
||||
if (c + 1 < searchFieldLen) {
|
||||
putchar(' ');
|
||||
}
|
||||
}
|
||||
putchar('\n');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,54 +1,12 @@
|
||||
#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.
|
||||
char* readWord(FILE *file)
|
||||
{
|
||||
char word[MAX_WORD_LEN]; // Puffer für Wort
|
||||
int index = 0; // Position im Puffer
|
||||
int c; // Variable für jedes gelesene Zeichen
|
||||
|
||||
// Whitespace und Delimiters überspringen
|
||||
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((unsigned char)c) && c != ',' && c != ';' && c != '.' && index < MAX_WORD_LEN - 1) //-1 wegen Nullterminator
|
||||
{
|
||||
word[index++] = (char)toupper((unsigned char)c); // Konvertiere zu Großbuchstaben
|
||||
c = fgetc(file);
|
||||
}
|
||||
word[index] = '\0'; // Nullterminator (= Ende String)
|
||||
|
||||
if (index == 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return strdup(word); // Rückgabe string, dynamisch allokiert da Zeiger auf lokalen Puffer zurückgegeben
|
||||
}
|
||||
|
||||
// Read words from file and store in 'words' array
|
||||
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
|
||||
{
|
||||
unsigned int count = 0;
|
||||
|
||||
while(count < maxWordCount && !feof(file))
|
||||
{
|
||||
char *word = readWord(file);
|
||||
if(word != NULL)
|
||||
{
|
||||
strncpy(words[count], word, MAX_WORD_LEN - 1); // Wort in Array kopieren
|
||||
words[count][MAX_WORD_LEN - 1] = '\0'; // Sicherstellen, dass String nullterminiert ist
|
||||
free(word); // Dynamisch allokierten Speicher freigeben
|
||||
count++;
|
||||
}
|
||||
}
|
||||
|
||||
return count; // Anzahl gelesene Wörter zurückgeben
|
||||
}
|
||||
@ -6,7 +6,6 @@
|
||||
#define MAX_WORD_LEN 100
|
||||
#define MAX_LINE_LEN 1024
|
||||
|
||||
char* readWord(FILE *file);
|
||||
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount);
|
||||
|
||||
#endif
|
||||
|
||||
@ -31,30 +31,16 @@ 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);
|
||||
|
||||
|
||||
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
|
||||
|
||||
// DONE
|
||||
|
||||
|
||||
// Create the word salad by placing words into grid
|
||||
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
|
||||
|
||||
if(placedWords==wordCount)
|
||||
{
|
||||
// Spiel starten, mit dem erstellten wordSalad, der Anzahl der Wörter und der Liste der Wörter, 800 = Fensterbreite
|
||||
startGame(wordSalad, SALAD_SIZE, words, wordCount, 800);
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(stderr, "Could not place all words in the word salad. Placed %u out of %u words.\n", placedWords, wordCount);
|
||||
exitCode = EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -1,42 +1,45 @@
|
||||
CC = gcc
|
||||
CFLAGS = -g -Wall -Wextra
|
||||
CPPFLAGS = -I$(raylibfolder) -I$(unityfolder)
|
||||
LDFLAGS =
|
||||
LDLIBS = -lGL -lX11 -lm
|
||||
|
||||
CFLAGS = -g -Wall
|
||||
LDFLAGS = -lGL -lX11 -lm
|
||||
BINARIES = ./linux
|
||||
|
||||
raylibfolder = ./raylib
|
||||
unityfolder = ./unity
|
||||
|
||||
TARGET = wordsalad
|
||||
# --------------------------
|
||||
# initiales Spiel bauen
|
||||
# --------------------------
|
||||
wordsalad_initial:
|
||||
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.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) $(CFLAGS) $(CPPFLAGS) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
|
||||
$(CC) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
|
||||
|
||||
# --------------------------
|
||||
# Clean
|
||||
# --------------------------
|
||||
clean:
|
||||
rm -f *.o $(TARGET) $(TEST_BIN) wordsalad_ourversion
|
||||
rm -f *.o wordsalad $(TEST_BIN)
|
||||
|
||||
@ -2,4 +2,4 @@ Yeti,Nessie Werwolf; Vampir
|
||||
Monster
|
||||
Hydra;Frankenstein
|
||||
Dracula;KingKong;Gremlin;Kobold,Hexe;Poltergeist
|
||||
Gespenst, Oger
|
||||
Gespenst, Oger
|
||||
Loading…
x
Reference in New Issue
Block a user