From 31fbbb315333a5e3761c68af4b3459969dc3ad7e Mon Sep 17 00:00:00 2001
From: maxgrf <r9ky2wmtjf@privaterelay.appleid.com>
Date: Mon, 10 Nov 2025 13:25:34 +0100
Subject: [PATCH] game update

---
 Start_Windows/game.c | 98 ++++++++++++++++++++++++++++----------------
 1 file changed, 63 insertions(+), 35 deletions(-)

diff --git a/Start_Windows/game.c b/Start_Windows/game.c
index b4736e0..6b74bde 100644
--- a/Start_Windows/game.c
+++ b/Start_Windows/game.c
@@ -18,74 +18,101 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
    srand(time(NULL));
 
    int placedWords = 0;
-   unsigned int tries = 0;
+   unsigned int attemps = 0;
    unsigned int check_direction = 0, check_overlap = 0;
    int zeile = 0, spalte = 0, len = 0;
    
-    //1. Schritt: Alle Felder mit 0 befüllen
+    //Alle Felder mit ? befüllen
    for(int m = 0; m < searchFieldLen; m++) //m Zeilen
    {
       for(int n = 0; n < searchFieldLen; n++) //n Spalte
       {
-         salad[m][n] = '.';
+         salad[m][n] = '?';
       }
    }
    
-   // 2. Schritt: Prüfen ob Wort in Array geschrieben darf
+   //Prüfen ob Wort in Array geschrieben darf
    for(int num_words = 0; num_words < wordCount; num_words++)   //eingelesen Wörter zählen
    {
       len = strlen(words[num_words]); //Größe des Wortes ermitteln
 
-      if (len < searchFieldLen) 
-         return -1; //ERROR, falls Wort größer als Größe des Feldes (unnötig, da bei worteingabe bereits überprüft)
-
-      while(tries < MAX_RAND_TRIES_PER_WORD)
+      while(attemps < MAX_RAND_TRIES_PER_WORD)
       {
          // zufällige Richtung auswählen
          int direction = rand() % 2;   // 0 = VERTIKAL, 1 = HORIZONTAL
          
          // zufälliger Startpunkt, Startkoordinaten
-         if (direction == 0)  // 0 = VERTIKAL -> Spalte egal
+         if (direction == 0)  // 0 = VERTIKAL
          {
-             zeile = rand() % (searchFieldLen - len); 
-             spalte = rand() % (searchFieldLen);
+             zeile = rand() % searchFieldLen; 
+             spalte = rand() % searchFieldLen;
              check_direction = 1;
          }
 
-         if (direction == 1)  // 1 = HORIZONTAL -> Zeile egal
+         if (direction == 1)  // 1 = HORIZONTAL
          {
-            zeile = rand() % (searchFieldLen); 
-            spalte = rand() % (searchFieldLen - len);
+            zeile = rand() % searchFieldLen; 
+            spalte = rand() % searchFieldLen;
             check_direction = 1;
          }
-         
-         //Prüfen auf Überlappung      ----------> Logikfehler
-         for(int i_overlap = 0; i_overlap < len; i_overlap++)
+
+         for(int i = 0; i < len; i++)
          {
             if (direction == 0)  // 0 = VERTIKAL
             {
-               if(salad[zeile + i_overlap][spalte] != '.')
+               //Prüfe ob Feld bereits belegt
+               if (salad[zeile+i][spalte] != '?') 
                {
-                  check_overlap = 1; //wenn check_overlap = 1 -> belegt
+                  check_overlap = 1; // 1 = Überlappung
                   break;
                }
-            }
-            else if (direction == 1)   // 1 = HORIZONTAL
-            {
-               if(salad[zeile][spalte + i_overlap] == '.')
-               {
-                  check_overlap = 1; //wenn check_overlap = 1 -> belegt
-                  break;
-               }
-            }
-            if(check_overlap == 0)
-            {
-               tries++;
-               break;
-            }
-         }
 
-         //3. Schritt: Wort in Wortsalat schreiben
+               //Prüfe auf Groeße
+               if (spalte + len >= searchFieldLen-1 || check_overlap == 1)
+               {
+                  attemps++;
+               }
+
+               else
+               {
+                  for(int k; k < len; k++)
+                  {
+                     salad[zeile][spalte+k] = words[i][k];
+                     placedWords++;
+                  }
+               }
+            }
+
+            if (direction == 1)  // 1 = HORZIZONTAL
+            {
+               //Prüfe ob Feld bereits belegt
+               if (salad[zeile][spalte+i] != '?') 
+               {
+                  check_overlap = 1; // 1 = Überlappung
+                  break;
+               }
+
+               //Prüfe auf Groeße
+               if (zeile + len >= searchFieldLen-1 || check_overlap == 1)
+               {
+                  attemps++;
+               }
+
+               else
+               {
+                  for(int k; k < len; k++)
+                  {
+                     salad[zeile+k][spalte] = words[i][k];
+                     placedWords++;
+                  }
+               }
+            }  
+         }
+      }
+
+/*
+         
+   //Wort in Wortsalat schreiben
          if(check_direction == 1 && check_overlap == 0 && tries < MAX_RAND_TRIES_PER_WORD)
             {
                for(int i_set = 0; i_set < len; i_set++)
@@ -121,6 +148,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
       }
    } 
 */
+   }
    return placedWords; //platzierte Wörter zurückgeben
    
 }