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

Fixing warnings and errors, unit tests run

Browse Source
This commit is contained in:
D2A62006 2025-11-06 12:33:13 +01:00
parent 9b54d8913e
commit 46a6f8c682
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Start_Linux/game.c
View File

@ -30,6 +30,10 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
int wordLen = strlen(words[w]); int wordLen = strlen(words[w]);
int placed = 0; int placed = 0;
if(wordLen > searchFieldLen){
printf("Word %s is too long!\n", words[w]);
break;
}
//Try multiple times to find a valid position //Try multiple times to find a valid position
for(int attempt = 0; attempt < MAX_RAND_TRIES_PER_WORD && !placed; attempt++){ for(int attempt = 0; attempt < MAX_RAND_TRIES_PER_WORD && !placed; attempt++){
//Random orientation: 0 = horizontal, 1 = vertical //Random orientation: 0 = horizontal, 1 = vertical
@ -49,7 +53,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
} }
} }
// Place word if position is valid //Place word
if(canPlace){ if(canPlace){
for(int i = 0; i < wordLen; i++){ for(int i = 0; i < wordLen; i++){
salad[row][col + i] = words[w][i]; salad[row][col + i] = words[w][i];
@ -92,22 +96,25 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
} }
} }
return wordsPlaced; // Return number of words successfully placed return wordsPlaced;
} }
// Prints the word salad to console // Prints the word salad to console
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen) 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 i = 0; i < searchFieldLen; i++){
for(int j = 0; j < searchFieldLen; j++){ for(int j = 0; j < searchFieldLen; j++){
puts(salad[i][j]); printf("%c ", salad[i][j]);
} }
puts("\n");
} }
} }
//Fill up Word salad //Fill up Word salad
void fillWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]){ void fillWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]){

14
Start_Linux/main.c
View File

@ -5,7 +5,8 @@
#include "graphicalGame.h" #include "graphicalGame.h"
#define MAX_NUMBER_OF_WORDS 100 #define MAX_NUMBER_OF_WORDS 100
#define SALAD_SIZE 20 #define SALAD_SIZE 10
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -36,10 +37,13 @@ int main(int argc, char *argv[])
// Create the word salad by placing words into grid // Create the word salad by placing words into grid
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount); placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
// TODO: if(placedWords < wordCount){
// Check if all words were successfully placed printf("%d Words didn't fit!\n", wordCount-placedWords);
// Start the game if successful return -1;
// error message if some words couldn't be placed }
showWordSalad(wordSalad, SALAD_SIZE);
startGame(wordSalad, SALAD_SIZE, words, wordCount, 600); startGame(wordSalad, SALAD_SIZE, words, wordCount, 600);