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

Reviewed-on: #3

.gitignore

@@ -4,4 +4,6 @@ input.o
 runTests
 main.o
 graphicalGame.o
-wordsalad
+wordsalad
+wordsalad_initial.exe
+runTests.exe

Start_Linux/main.c

@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
     int exitCode = EXIT_SUCCESS;
 
     // 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]);
         exitCode = EXIT_FAILURE;
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 
         FILE *file = fopen(argv[1], "r");
 
-        if(file != NULL)
+        if (file != NULL)
         {
             unsigned int placedWords = 0;
             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
             placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
 
-            // TODO:
             // Check if all words were successfully placed
             // Start the game if successful
             // 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
         {

Start_Windows/main.c

@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
     int exitCode = EXIT_SUCCESS;
 
     // 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]);
         exitCode = EXIT_FAILURE;
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 
         FILE *file = fopen(argv[1], "r");
 
-        if(file != NULL)
+        if (file != NULL)
         {
             unsigned int placedWords = 0;
             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
             placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
 
-            // TODO:
             // Check if all words were successfully placed
             // Start the game if successful
             // 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
         {