test wird bestanden

This commit is contained in:
Simon 2025-10-25 18:29:18 +02:00
parent ad88cbbba6
commit df2d64c137
2 changed files with 75 additions and 95 deletions

View File

@ -24,8 +24,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
}
}
showWordSalad(salad, 20);
// showWordSalad(salad, 20);
srand(time(NULL));
int wordsPlaced = 0;
@ -33,16 +32,19 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
// loop through all words
for (int n = 0; n < wordCount; n++)
{
int checkSquare, letterPlaced, retries = 0;
int checkSquare, retries = 0;
int wordLength = strlen(words[n]);
if(wordLength > searchFieldLen) {
printf("Fehler");
break;
}
// get random coordinates
int rndX = rand() % (searchFieldLen - wordLength + 1);
int rndY = rand() % (searchFieldLen - wordLength + 1);
// rand() % 2
if (1)
{
while (letterPlaced < wordLength)
if (rand() % 2)
{
// checks if word fits into gamefield
while (checkSquare != wordLength && retries < 10)
@ -61,7 +63,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
rndX = rand() % (searchFieldLen - wordLength + 1);
rndY = rand() % (searchFieldLen - wordLength + 1);
// retries++;
retries++;
}
}
@ -70,24 +72,21 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
printf("Word %d couldn't be placed", n);
break;
}
printf("%d %d",n, checkSquare);
// pastes word into the line
if (checkSquare == wordLength)
{
for (int x = 0; x < wordLength; x++)
{
salad[rndY][rndX + x] = words[n][x];
letterPlaced++;
}
}
}
wordsPlaced++;
wordsPlaced++;
}
else
{
while (letterPlaced < wordLength)
{
// checks if word fits into gamefield
while (checkSquare != wordLength && retries < 10)
{
@ -111,7 +110,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
if (retries >= 10)
{
printf("Word %u couldn't be placed", n);
printf("Word %d couldn't be placed", n);
break;
}
@ -121,10 +120,9 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
for (int y = 0; y < wordLength; y++)
{
salad[y + rndY][rndX] = words[n][y];
letterPlaced++;
}
}
}
wordsPlaced++;
}
}
@ -137,12 +135,11 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
if (salad[y][x] == '\0')
{
// random number from 65 (A) to 90 (Z) with ASCII
// salad[y][x] = (char) (rand() % (25 + 1) + 65);
salad[y][x] = 120;
salad[y][x] = rand() % (25 + 1) + 65;
}
}
}
return 15;
return wordsPlaced;
}
// Prints the word salad to console
@ -159,16 +156,3 @@ void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN],
printf(" %c\n", salad[i][searchFieldLen]);
}
}
// Clear Wordsalad
void clearWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
{
int i, j = 0;
for (i = 0; i < searchFieldLen; i++)
{
for (j = 0; j < searchFieldLen; j++)
{
salad[i][j] = '\0';
}
}
}

View File

@ -11,12 +11,10 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
char puffer[MAX_LINE_LEN];
char *teiler = " ,;.\n";
char *token;
file = fopen("words.txt", "r");
if (file == NULL)
{
printf("\nNot able to open file.\n");
fclose(file);
return -1;
}
@ -43,7 +41,5 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
n++;
}
}
fclose(file);
return n;
}