diff --git a/Start_Windows/game.c b/Start_Windows/game.c index b0aa142..a4b520f 100644 --- a/Start_Windows/game.c +++ b/Start_Windows/game.c @@ -2,127 +2,117 @@ #include #include #include -#include - #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 */ // 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) -{ +int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount) { + int addedWords = 0; + int attempts = 0; //Anzahl an Versuchen ein Wort hinzuzufügen + int added = 0; //0 Wort nicht hinzugefügt , 1 Wort hinzugefügt + int space = 0; // 1 = Wort zu lang für diese Stelle + unsigned long long wordLength = 0; srand(time(NULL)); - int placedWords = 0; - unsigned int attemps = 0; - unsigned int check_overlap = 0; - int zeile = 0, spalte = 0, len = 0; - - //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] = '?'; + for (int i = 0; i < searchFieldLen; i++) { + for (int j = 0; j < searchFieldLen; j++) { + salad[i][j] = '.'; //Füllen des gesamten Arrays mit Nullen } } - - //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 + for (int i=0; i < wordCount; i++) { - 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 - { - zeile = rand() % searchFieldLen; - spalte = rand() % searchFieldLen; - } + wordLength = strlen(words[i]); - if (direction == 1) // 1 = HORIZONTAL - { - zeile = rand() % searchFieldLen; - spalte = rand() % searchFieldLen; - } - - for(int i = 0; i < len; i++) - { - if (direction == 0) // 0 = VERTIKAL + while (attempts <= MAX_RAND_TRIES_PER_WORD && added != 1) { + int direction = rand() % 2;// 0 Horizontal, 1 Vertikal + if (direction == 0) { + int spalte = rand() % searchFieldLen; + int reihe = rand() % searchFieldLen; + for (int j = 0; j < wordLength; j++) { - //Prüfe ob Feld bereits belegt - if (salad[zeile+i][spalte] != '?') + if (salad[reihe][spalte+j] != '.') //Prüfen ob das Wort ein bereits vorhandenes Wort überspeichern würde { - check_overlap = 1; // 1 = Überlappung + space = 1; break; } - - //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 ((spalte + wordLength >= searchFieldLen-1) || (space == 1)) + { + attempts++; } - if (direction == 1) // 1 = HORZIZONTAL + //Prüfen ob Wort an der Stelle (Zeile, Spalte) in das Array passt + else { - //Prüfe ob Feld bereits belegt - if (salad[zeile][spalte+i] != '?') + for (int j = 0; j < wordLength; j++) { - check_overlap = 1; // 1 = Überlappung + salad[reihe][spalte+j] = words[i][j]; //Einfügen des Wortes Buchstabe für Buchstabe + } + added=1; + addedWords++; + } + } + else if (direction == 1) // Vertikal + { + int spalte = rand() % searchFieldLen; + int reihe = rand() % searchFieldLen; + for (int j = 0; j < wordLength; j++) + { + if (salad[reihe+j][spalte] != '.') + { + space = 1; break; } + } + if ((reihe + wordLength >= searchFieldLen-1) || (space == 1)) + { + attempts++; + } - //Prüfe auf Groeße - if (zeile + len >= searchFieldLen-1 || check_overlap == 1) - { - attemps++; - } - else + else + { + for (int j = 0; j < wordLength; j++) { - for(int k; k < len; k++) - { - salad[zeile+k][spalte] = words[i][k]; - placedWords++; - } + salad[row+j][collumn] = words[i][j]; } - } + added=1; + addedWords++; + } + } + space = 0; + } + attempts = 0; + added = 0; + } + for (int i = 0; i < searchFieldLen; i++) + { + for (int j = 0; j < searchFieldLen; j++) { + if (salad[i][j] == '.') + { + salad[i][j] = rand()%('Z'-'A'+1)+'A';//Alle Felder, die noch nicht befüllt sind, werden zufällig befüllt } } } - return placedWords; //platzierte Wörter zurückgeben + return addedWords; } - - - // Prints the word salad to console void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen) { - for(int p = 0; p < searchFieldLen; p++) + for(int i = 0; i < searchFieldLen; i++) { - for(int q = 0; q < searchFieldLen; q++) + for(int j = 0; j < searchFieldLen; j++) { - printf("%c", salad[p][q]); + printf("%c", salad[i][j]);//Ausgabe des Arrays auf die Konsole } - printf("\n"); } -} \ No newline at end of file +} diff --git a/Start_Windows/game.o b/Start_Windows/game.o new file mode 100644 index 0000000..9aa95e1 Binary files /dev/null and b/Start_Windows/game.o differ diff --git a/Start_Windows/input.o b/Start_Windows/input.o new file mode 100644 index 0000000..d0f0768 Binary files /dev/null and b/Start_Windows/input.o differ diff --git a/Start_Windows/main.c b/Start_Windows/main.c index ed129e6..2ea62b3 100644 --- a/Start_Windows/main.c +++ b/Start_Windows/main.c @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) else { exitCode = EXIT_FAILURE; - printf("Bei der Platzierung ist etwas falsch gelaufen!"); + printf("Error. The words couldn't be placed.\n"); } // Start the game if successful // error message if some words couldn't be placed diff --git a/Start_Windows/runTests2.exe b/Start_Windows/runTests2.exe new file mode 100644 index 0000000..7a78b9e Binary files /dev/null and b/Start_Windows/runTests2.exe differ diff --git a/Start_Windows/testwords_delims.txt b/Start_Windows/testwords_delims.txt deleted file mode 100644 index e721fce..0000000 --- a/Start_Windows/testwords_delims.txt +++ /dev/null @@ -1 +0,0 @@ -Hund,Katze; Maus diff --git a/Start_Windows/testwords_empty.txt b/Start_Windows/testwords_empty.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Start_Windows/testwords_simple.txt b/Start_Windows/testwords_simple.txt deleted file mode 100644 index 37d7524..0000000 --- a/Start_Windows/testwords_simple.txt +++ /dev/null @@ -1,3 +0,0 @@ -Apfel -Banane -Kiwi \ No newline at end of file