diff --git a/Wordsalat/game.c b/Wordsalat/game.c index 5ea312d..faa7e59 100644 --- a/Wordsalat/game.c +++ b/Wordsalat/game.c @@ -15,30 +15,15 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi { unsigned int placedWords = 0; - //printf("start game.c\n"); - emptyField(searchFieldLen, salad); for(int i = 0; i < wordCount; i++) { placedWords += placement(salad, searchFieldLen, words[i]); - - //printf("[%d] of words: %s\n", i, words[i]); } fillRandAlpha(searchFieldLen, salad); - printf("placedWords:%d\n", placedWords); - - for(int i = 0; i < searchFieldLen; i++) - { - for(int j = 0; j < searchFieldLen; j++) - { - printf("%c", salad[j][i]); - } - printf("\n"); - } - return placedWords; } @@ -57,8 +42,6 @@ int placement(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned i int saladX = rand() % ( searchFieldLen - strlen(word) ); int saladY = rand() % ( searchFieldLen - strlen(word) ); - printf("%s\n", word); - if(rand() % 2) { for(int i = 0; i < strlen(word); i++) @@ -100,11 +83,8 @@ void emptyField(unsigned int searchFieldLen, char salad[MAX_SEARCH_FIELD_LEN][MA { for(size_t j = 0; j < searchFieldLen; j++) { - //salad[i][j] = '\0'; - salad[i][j] = ' '; - printf("%c", salad[i][j]); + salad[i][j] = '\0'; } - printf("\n"); } } @@ -117,10 +97,8 @@ char fillRandAlpha(unsigned int searchFieldLen, char salad[MAX_SEARCH_FIELD_LEN] if(!isalpha(salad[i][j])) { salad[i][j] = alphaRand(); - //printf("%c", salad[i][j]); } } - printf("\n"); } return 0; } diff --git a/Wordsalat/game.o b/Wordsalat/game.o index 04c6c6e..a0597bd 100644 Binary files a/Wordsalat/game.o and b/Wordsalat/game.o differ diff --git a/Wordsalat/input.c b/Wordsalat/input.c index 9386325..7c29ab2 100644 --- a/Wordsalat/input.c +++ b/Wordsalat/input.c @@ -11,22 +11,18 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount) { - printf("start readWords\n"); int wordcount = 0; char buffer[256]; char *line = fgets(buffer, sizeof(buffer), file); while(line != NULL) { - printf("%d. loop\n", wordcount); - printf("line: %s\n", line); - char* word = strtok(line, " ,;"); while (word != NULL) { strncpy(words[wordcount], word, strlen(word)); - //printf("%d. word: %s\n", wordcount, words[wordcount]); + wordcount += 1; word = strtok(NULL, " ,;\t\n"); @@ -46,12 +42,7 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount) words[i][j] = '\0'; } } - - printf("%d. word: %s\n", i, words[i]); } - - - printf("wordcount = %d\n", wordcount); return wordcount; } diff --git a/Wordsalat/input.o b/Wordsalat/input.o index f8c84e6..d3942b7 100644 Binary files a/Wordsalat/input.o and b/Wordsalat/input.o differ diff --git a/Wordsalat/main.c b/Wordsalat/main.c index 008e773..381a7ae 100644 --- a/Wordsalat/main.c +++ b/Wordsalat/main.c @@ -14,8 +14,8 @@ int main(int argc, char *argv[]) { int exitCode = EXIT_SUCCESS; - printf("start main\n"); srand(time(NULL)); + // Check if the correct number of arguments is provided if(argc != 2) { @@ -51,13 +51,17 @@ int main(int argc, char *argv[]) { // Start the game if successful + startGame(wordSalad, SALAD_SIZE, words, wordCount, 800); + return exitCode; } } // error message if some words couldn't be placed - fprintf(stderr, "could not start wordsalad.\n"); + fprintf(stderr, "Could not start wordsalad. "); + printf("Out of %d words only %d could be placed.\n", wordCount, placedWords); + puts("GOOD LUCK for getting this game started :)"); exitCode = EXIT_FAILURE; } else diff --git a/Wordsalat/main.o b/Wordsalat/main.o index 224f0a1..addcd95 100644 Binary files a/Wordsalat/main.o and b/Wordsalat/main.o differ diff --git a/Wordsalat/wordsalad b/Wordsalat/wordsalad index a4004a0..93ea713 100755 Binary files a/Wordsalat/wordsalad and b/Wordsalat/wordsalad differ