merge upstream

Start_Windows/game.c

@@ -13,29 +13,29 @@
 // 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));
    // wipe field
    int placedWords = 0;
-   for (int i = 0; searchFieldLen < i; i++)
+   for (int i = 0; i < searchFieldLen; i++)
    {
-      for (int j = 0; searchFieldLen < j; i++)
+      for (int j = 0; j < searchFieldLen ; j++)
          salad[i][j] = EMPTY_CHAR;
    }
    // place Words
    for (int wordNumber = 0; wordNumber < wordCount; wordNumber++)
    {
-      srand(time(NULL));
       int wordlength = strlen(words[wordNumber]);
 
       int placed = 0;
 
       for (int try = 0; (try < MAX_RAND_TRIES_PER_WORD) && !placed; try++)
       {
-         int horizontal = rand() % 2;
+         int horizontal = rand() % 2; // 0 vertikal --> 1 horizontal
 
          int x = rand() % searchFieldLen;
          int y = rand() % searchFieldLen;
 
-         if (horizontal = 1)
+         if (horizontal)
          {
             if (x + wordlength > searchFieldLen) // word does not fit
             {
@@ -46,18 +46,18 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
 
             for (int i = 0; i < wordlength; i++) // position already occupied by other word
             {
-               if (salad[y][x + 1] != EMPTY_CHAR)
+               if (salad[y][x + i] != EMPTY_CHAR)
                {
                   fits = 0;
                   break;
                }
             }
 
-            if (fits = 1)
+            if (fits)
             {
                for (int i = 0; i < wordlength; i++)
                {
-                  salad[y][x + 1] = words[wordNumber][i];
+                  salad[y][x + i] = words[wordNumber][i];
                }
                placed = 1;
                placedWords++;
@@ -74,18 +74,17 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
 
             for (int i = 0; i < wordlength; i++) // position already occupied by other word
             {
-               if (salad[y + 1][x] != EMPTY_CHAR)
-                  ;
+               if (salad[y + i][x] != EMPTY_CHAR)
                {
                   fits = 0;
                   break;
                }
             }
-            if (fits = 1)
+            if (fits)               
             {
                for (int i = 0; i < wordlength; i++)
                {
-                  salad[y + 1][x] = words[wordNumber][i];
+                  salad[y + i][x] = words[wordNumber][i];
                }
                placed = 1;
                placedWords++;
@@ -101,7 +100,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
       {
          if (salad[i][j] == EMPTY_CHAR)
          {
-            salad[i][j] = (rand() % ((90 - 65) + 1)) + 65;     // 90 ist Z in ASCII und A ist 65
+            salad[i][j] = rand() % ('Z' - 'A' + 1) + 'A';     // 90 ist Z in ASCII und A ist 65
          }
       }
    }

Start_Windows/input.c

@@ -27,6 +27,11 @@ while (fgets(line, sizeof(line), file) && (count < maxWordCount))
     char *token = strtok(line, " ;,");
 while (token && (count < maxWordCount))
 {
+    for (int i = 0; token[i] != '\0'; i++)
+    {
+        token[i] = toupper(token[i]);
+    }
+    
     strcpy(words[count], token);
     count++;
     token = strtok(NULL, " ;,");

Start_Windows/makefile

@@ -6,6 +6,12 @@ BINARIES = ./windows
 raylibfolder = ./raylib
 unityfolder = ./unity
 
+# --------------------------
+# my version
+# --------------------------
+wordsalad_myversion: main.o graphicalGame.o
+	$(CC) main.o graphicalGame.o -o wordsalad_myversion $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS)
+
 # --------------------------
 # initiales Spiel bauen
 # --------------------------