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

Reviewed-on: #3
This commit was merged in pull request #3.
This commit is contained in:
2025-10-31 08:05:56 +00:00
4 changed files with 23 additions and 7 deletions
+2
View File
@@ -5,3 +5,5 @@ runTests
main.o main.o
graphicalGame.o graphicalGame.o
wordsalad wordsalad
wordsalad_initial.exe
runTests.exe
+8 -1
View File
@@ -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
{ {
+8 -1
View File
@@ -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
{ {
Binary file not shown.