Compare commits

..

No commits in common. "9a1f2d1d8a8431e9b22d7b01be273178d49a0164" and "a763ea910e91de211074c607b325f0ac911940a3" have entirely different histories.

2 changed files with 21 additions and 32 deletions

View File

@ -30,10 +30,6 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
int wordLen = strlen(words[w]); int wordLen = strlen(words[w]);
int placed = 0; int placed = 0;
if(wordLen > searchFieldLen){
printf("Word %s is too long!\n", words[w]);
break;
}
// Try multiple times to find a valid position // Try multiple times to find a valid position
for(int attempt = 0; attempt < MAX_RAND_TRIES_PER_WORD && !placed; attempt++){ for(int attempt = 0; attempt < MAX_RAND_TRIES_PER_WORD && !placed; attempt++){
// Random orientation: 0 = horizontal, 1 = vertical // Random orientation: 0 = horizontal, 1 = vertical
@ -53,7 +49,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
} }
} }
//Place word // Place word if position is valid
if(canPlace){ if(canPlace){
for(int i = 0; i < wordLen; i++){ for(int i = 0; i < wordLen; i++){
salad[row][col + i] = words[w][i]; salad[row][col + i] = words[w][i];
@ -96,24 +92,21 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
} }
} }
return wordsPlaced; return wordsPlaced; // Return number of words successfully placed
} }
// Prints the word salad to console // Prints the word salad to console
void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen) void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
{ {
for(int i = 0; i < searchFieldLen; i++){ for(int i = 0; i < searchFieldLen; i++){
for(int j = 0; j < searchFieldLen; j++){ for(int j = 0; j < searchFieldLen; j++){
printf("%c ", salad[i][j]); puts(salad[i][j]);
} }
puts("\n");
} }
} }
//Fill up Word salad //Fill up Word salad
void fillWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]){ void fillWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]){

View File

@ -5,8 +5,7 @@
#include "graphicalGame.h" #include "graphicalGame.h"
#define MAX_NUMBER_OF_WORDS 100 #define MAX_NUMBER_OF_WORDS 100
#define SALAD_SIZE 10 #define SALAD_SIZE 20
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -37,13 +36,10 @@ int main(int argc, char *argv[])
// Create the word salad by placing words into grid // Create the word salad by placing words into grid
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount); placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
if(placedWords < wordCount){ // TODO:
printf("%d Words didn't fit!\n", wordCount-placedWords); // Check if all words were successfully placed
return -1; // Start the game if successful
} // error message if some words couldn't be placed
showWordSalad(wordSalad, SALAD_SIZE);
startGame(wordSalad, SALAD_SIZE, words, wordCount, 600); startGame(wordSalad, SALAD_SIZE, words, wordCount, 600);