6 changed files with 170 additions and 9 deletions
+6 -1
View File
@@ -1 +1,6 @@
Start_Linux/wordsalad_initial
wordsalad_initial
runTests
.vscode
*.o
*.exe
wordsalad
+93 -1
View File
@@ -2,10 +2,12 @@
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#define MAX_RAND_TRIES_PER_WORD 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 */
@@ -13,11 +15,101 @@
// 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)
{
srand(time(NULL));
//Fill salad with empty_char
for(int i = 0; i < searchFieldLen; i++){
for(int j = 0; j < searchFieldLen; j++){
salad[i][j] = EMPTY_CHAR;
}
}
int wordsPlaced = 0; // Track number of words successfully placed
// Try to place each word
for(int w = 0; w < wordCount; w++){
int wordLen = strlen(words[w]);
int placed = 0;
// 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
int orientation = rand() % 2;
int row, col;
if(orientation == 0){ // Horizontal
row = rand() % searchFieldLen;
col = rand() % (searchFieldLen - wordLen + 1); // Ensure word fits
// Check if position is free
int canPlace = 1;
for(int i = 0; i < wordLen; i++){
if(salad[row][col + i] != EMPTY_CHAR && salad[row][col + i] != words[w][i]){
canPlace = 0;
break;
}
}
// Place word if position is valid
if(canPlace){
for(int i = 0; i < wordLen; i++){
salad[row][col + i] = words[w][i];
}
placed = 1;
wordsPlaced++;
}
}
else{ // Vertical
row = rand() % (searchFieldLen - wordLen + 1); // Ensure word fits
col = rand() % searchFieldLen;
// Check if position is free
int canPlace = 1;
for(int i = 0; i < wordLen; i++){
if(salad[row + i][col] != EMPTY_CHAR && salad[row + i][col] != words[w][i]){
canPlace = 0;
break;
}
}
// Place word if position is valid
if(canPlace){
for(int i = 0; i < wordLen; i++){
salad[row + i][col] = words[w][i];
}
placed = 1;
wordsPlaced++;
}
}
}
}
// Fill remaining empty cells with random letters
for(int i = 0; i < searchFieldLen; i++){
for(int j = 0; j < searchFieldLen; j++){
if(salad[i][j] == EMPTY_CHAR){
salad[i][j] = 'A' + (rand() % 26);
}
}
}
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++){
puts(salad[i][j]);
}
}
}
//Fill up Word salad
void fillWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]){
}
+49 -1
View File
@@ -8,5 +8,53 @@
// Read words from file and store in 'words' array
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
{
if(file == NULL) {
return 0;
}
int wordCount = 0;
char buffer[1024]; // Buffer for reading lines
// 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;
for(int i = 0; buffer[i] != '\0'; i++) {
char c = buffer[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 {
// Non-letter character = word delimiter
if(wordIndex > 0) {
// We have a complete word
currentWord[wordIndex] = '\0';
strcpy(words[wordCount], currentWord);
wordCount++;
wordIndex = 0;
// Check if we've reached max word count
if(wordCount >= maxWordCount) {
return 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++;
}
}
return wordCount;
}
+2
View File
@@ -41,6 +41,8 @@ int main(int argc, char *argv[])
// Start the game if successful
// error message if some words couldn't be placed
startGame(wordSalad, SALAD_SIZE, words, wordCount, 600);
}
else
{
+8 -6
View File
@@ -6,12 +6,6 @@ BINARIES = ./linux
raylibfolder = ./raylib
unityfolder = ./unity
# --------------------------
# initiales Spiel bauen
# --------------------------
wordsalad_initial:
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
# --------------------------
# Normales Spiel bauen
# --------------------------
@@ -30,6 +24,13 @@ game.o: game.c
graphicalGame.o: graphicalGame.c
$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c
# --------------------------
# initiales Spiel bauen
# --------------------------
wordsalad_initial:
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
# --------------------------
# Unit Tests
# --------------------------
@@ -38,6 +39,7 @@ TEST_BIN = runTests
test: input.o game.o unit_tests.c
$(CC) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
# --------------------------
# Clean
# --------------------------
+12
View File
@@ -0,0 +1,12 @@
## Todo
#### game.c
_Vorgegebene Anweisung:_
Wörter aus der Wortliste zufällig horizontal oder vertikal plazieren, restliche Felder mit zufälligen Buchstaben füllen
#### input.c
_Vorgegebene Anweisung:_
eine Funktion implementierenm die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt
#### main.c
_Vorgegebene Anweisung:_
Check if all words were successfully placed
start the game if successfull
error message if some words couldn't be placed