wiesendsi102436/info2Praktikum-Wortsalat
1
0
Fork 0
forked from freudenreichan/info2Praktikum-Wortsalat
Code Issues Pull Requests Releases Activity

Merge pull request 'simon' (#3) from simon into main

Browse Source 
Reviewed-on: #3
This commit was merged in pull request #3.
This commit is contained in:
wiesendsi102436
2025-10-31 08:05:56 +00:00
parent 6244fad3d4 4041e9ee9b
commit 27eafd14cc
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -5,3 +5,5 @@ runTests
main.o main.o
graphicalGame.o graphicalGame.o
wordsalad wordsalad
wordsalad_initial.exe
runTests.exe
Start_Linux/main.c
+10 -3
View File
@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
int exitCode = EXIT_SUCCESS; int exitCode = EXIT_SUCCESS;
// Check if the correct number of arguments is provided // Check if the correct number of arguments is provided
if(argc != 2) if (argc != 2)
{ {
fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]); fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]);
exitCode = EXIT_FAILURE; exitCode = EXIT_FAILURE;
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
FILE *file = fopen(argv[1], "r"); FILE *file = fopen(argv[1], "r");
if(file != NULL) if (file != NULL)
{ {
unsigned int placedWords = 0; unsigned int placedWords = 0;
char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad
@@ -36,11 +36,18 @@ 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:
// Check if all words were successfully placed // Check if all words were successfully placed
// Start the game if successful // Start the game if successful
// error message if some words couldn't be placed // error message if some words couldn't be placed
if (placedWords < wordCount)
{
fprintf(stderr, "some words couldn't be placed\n");
exitCode = EXIT_FAILURE;
}
// TODO:
// Start the game if successful
} }
else else
{ {
Start_Windows/main.c
+10 -3
View File
@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
int exitCode = EXIT_SUCCESS; int exitCode = EXIT_SUCCESS;
// Check if the correct number of arguments is provided // Check if the correct number of arguments is provided
if(argc != 2) if (argc != 2)
{ {
fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]); fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]);
exitCode = EXIT_FAILURE; exitCode = EXIT_FAILURE;
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
FILE *file = fopen(argv[1], "r"); FILE *file = fopen(argv[1], "r");
if(file != NULL) if (file != NULL)
{ {
unsigned int placedWords = 0; unsigned int placedWords = 0;
char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad
@@ -36,11 +36,18 @@ 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:
// Check if all words were successfully placed // Check if all words were successfully placed
// Start the game if successful // Start the game if successful
// error message if some words couldn't be placed // error message if some words couldn't be placed
if (placedWords < wordCount)
{
fprintf(stderr, "some words couldn't be placed\n");
exitCode = EXIT_FAILURE;
}
// TODO:
// Start the game if successful
} }
else else
{ {
Start_Windows/wordsalad_initial.exe
BIN
View File
Binary file not shown.