shobayoeniolasi99076/info2Praktikum-ES
1
0
Fork 0
generated from freudenreichan/info2Praktikum-Wortsalat
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Elena Riedmann 2026-04-10 11:29:53 +02:00
commit 4c5e903057
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Start_Linux/game.c
View File

@ -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) {
// Ein Wort konnte nicht platziert werden, Abbruch möglich
return 0;
if (placed) {
placedWords++;
}
}
@ -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

14
Start_Linux/input.c
View File

@ -12,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
}