finish wordsalad
- remove printf for debugging and add startGame to main.c
This commit is contained in:
1 parent
cbf5f85caf
commit
596e0a5519
7 files changed
+8
-35
No files matched your search
+1
-23
@@ -15,30 +15,15 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
|
|||||||
{
|
{
|
||||||
unsigned int placedWords = 0;
|
unsigned int placedWords = 0;
|
||||||
|
|
||||||
//printf("start game.c\n");
|
|
||||||
|
|
||||||
emptyField(searchFieldLen, salad);
|
emptyField(searchFieldLen, salad);
|
||||||
|
|
||||||
for(int i = 0; i < wordCount; i++)
|
for(int i = 0; i < wordCount; i++)
|
||||||
{
|
{
|
||||||
placedWords += placement(salad, searchFieldLen, words[i]);
|
placedWords += placement(salad, searchFieldLen, words[i]);
|
||||||
|
|
||||||
//printf("[%d] of words: %s\n", i, words[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fillRandAlpha(searchFieldLen, salad);
|
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;
|
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 saladX = rand() % ( searchFieldLen - strlen(word) );
|
||||||
int saladY = rand() % ( searchFieldLen - strlen(word) );
|
int saladY = rand() % ( searchFieldLen - strlen(word) );
|
||||||
|
|
||||||
printf("%s\n", word);
|
|
||||||
|
|
||||||
if(rand() % 2)
|
if(rand() % 2)
|
||||||
{
|
{
|
||||||
for(int i = 0; i < strlen(word); i++)
|
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++)
|
for(size_t j = 0; j < searchFieldLen; j++)
|
||||||
{
|
{
|
||||||
//salad[i][j] = '\0';
|
salad[i][j] = '\0';
|
||||||
salad[i][j] = ' ';
|
|
||||||
printf("%c", salad[i][j]);
|
|
||||||
}
|
}
|
||||||
printf("\n");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,10 +97,8 @@ char fillRandAlpha(unsigned int searchFieldLen, char salad[MAX_SEARCH_FIELD_LEN]
|
|||||||
if(!isalpha(salad[i][j]))
|
if(!isalpha(salad[i][j]))
|
||||||
{
|
{
|
||||||
salad[i][j] = alphaRand();
|
salad[i][j] = alphaRand();
|
||||||
//printf("%c", salad[i][j]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
printf("\n");
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
Binary file not shown.
+1
-10
@@ -11,22 +11,18 @@
|
|||||||
|
|
||||||
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
|
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
|
||||||
{
|
{
|
||||||
printf("start readWords\n");
|
|
||||||
int wordcount = 0;
|
int wordcount = 0;
|
||||||
char buffer[256];
|
char buffer[256];
|
||||||
char *line = fgets(buffer, sizeof(buffer), file);
|
char *line = fgets(buffer, sizeof(buffer), file);
|
||||||
|
|
||||||
while(line != NULL)
|
while(line != NULL)
|
||||||
{
|
{
|
||||||
printf("%d. loop\n", wordcount);
|
|
||||||
printf("line: %s\n", line);
|
|
||||||
|
|
||||||
char* word = strtok(line, " ,;");
|
char* word = strtok(line, " ,;");
|
||||||
|
|
||||||
while (word != NULL)
|
while (word != NULL)
|
||||||
{
|
{
|
||||||
strncpy(words[wordcount], word, strlen(word));
|
strncpy(words[wordcount], word, strlen(word));
|
||||||
//printf("%d. word: %s\n", wordcount, words[wordcount]);
|
|
||||||
wordcount += 1;
|
wordcount += 1;
|
||||||
|
|
||||||
word = strtok(NULL, " ,;\t\n");
|
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';
|
words[i][j] = '\0';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("%d. word: %s\n", i, words[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
printf("wordcount = %d\n", wordcount);
|
|
||||||
|
|
||||||
return wordcount;
|
return wordcount;
|
||||||
}
|
}
|
||||||
Binary file not shown.
+6
-2
@@ -14,8 +14,8 @@ int main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
int exitCode = EXIT_SUCCESS;
|
int exitCode = EXIT_SUCCESS;
|
||||||
|
|
||||||
printf("start main\n");
|
|
||||||
srand(time(NULL));
|
srand(time(NULL));
|
||||||
|
|
||||||
// Check if the correct number of arguments is provided
|
// Check if the correct number of arguments is provided
|
||||||
if(argc != 2)
|
if(argc != 2)
|
||||||
{
|
{
|
||||||
@@ -51,13 +51,17 @@ int main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
|
|
||||||
// Start the game if successful
|
// Start the game if successful
|
||||||
|
startGame(wordSalad, SALAD_SIZE, words, wordCount, 800);
|
||||||
|
|
||||||
return exitCode;
|
return exitCode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// error message if some words couldn't be placed
|
// 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;
|
exitCode = EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user