Merge branch 'game_devel_1'

Start_Linux/game.c

@@ -2,10 +2,12 @@
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 
 #define MAX_RAND_TRIES_PER_WORD 10
 #define EMPTY_CHAR 0
 
+
 //TODO: Spiellogik implementieren:
 /* * Wörter aus der Wortliste zufällig horizontal oder vertikal platzieren
    * restliche Felder mit zufälligen Buchstaben füllen */
@@ -13,16 +15,101 @@
 // Creates the word salad by placing words randomly and filling empty spaces
 int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount)
 {
+   srand(time(NULL));
+   //Fill salad with empty_char
+   for(int i = 0; i < searchFieldLen; i++){
+      for(int j = 0; j < searchFieldLen; j++){
+         salad[i][j] = EMPTY_CHAR;
+      }
+   }
+
+   int wordsPlaced = 0;  // Track number of words successfully placed
+   
+   // Try to place each word
+   for(int w = 0; w < wordCount; w++){
+      int wordLen = strlen(words[w]);
+      int placed = 0;
+      
+      // 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
+         int orientation = rand() % 2;
+         int row, col;
+         
+         if(orientation == 0){ // Horizontal
+            row = rand() % searchFieldLen;
+            col = rand() % (searchFieldLen - wordLen + 1); // Ensure word fits
+            
+            // Check if position is free
+            int canPlace = 1;
+            for(int i = 0; i < wordLen; i++){
+               if(salad[row][col + i] != EMPTY_CHAR && salad[row][col + i] != words[w][i]){
+                  canPlace = 0;
+                  break;
+               }
+            }
+            
+            // Place word if position is valid
+            if(canPlace){
+               for(int i = 0; i < wordLen; i++){
+                  salad[row][col + i] = words[w][i];
+               }
+               placed = 1;
+               wordsPlaced++;
+            }
+         }
+         else{ // Vertical
+            row = rand() % (searchFieldLen - wordLen + 1); // Ensure word fits
+            col = rand() % searchFieldLen;
+            
+            // Check if position is free
+            int canPlace = 1;
+            for(int i = 0; i < wordLen; i++){
+               if(salad[row + i][col] != EMPTY_CHAR && salad[row + i][col] != words[w][i]){
+                  canPlace = 0;
+                  break;
+               }
+            }
+            
+            // Place word if position is valid
+            if(canPlace){
+               for(int i = 0; i < wordLen; i++){
+                  salad[row + i][col] = words[w][i];
+               }
+               placed = 1;
+               wordsPlaced++;
+            }
+         }
+      }
+   }
+   
+   // Fill remaining empty cells with random letters
+   for(int i = 0; i < searchFieldLen; i++){
+      for(int j = 0; j < searchFieldLen; j++){
+         if(salad[i][j] == EMPTY_CHAR){
+            salad[i][j] = 'A' + (rand() % 26);
+         }
+      }
+   }
+   
+   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++){
+         puts(salad[i][j]);
+      }
+   }
 }
 
 //Fill up Word salad
 void fillWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]){
    
 }
+

Start_Linux/main.c

@@ -41,6 +41,8 @@ int main(int argc, char *argv[])
             // Start the game if successful
             // error message if some words couldn't be placed
 
+            startGame(wordSalad, SALAD_SIZE, words, wordCount, 600);
+
         }
         else
         {