Start_Linux/game.c

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

Start_Linux/main.c

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