Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d914e8aebf | |||
| 81cd68b949 | |||
| c8dd40149a |
BIN
Start_Mac/macos-x64/libraylib.a
Normal file
BIN
Start_Mac/macos-x64/libraylib.a
Normal file
Binary file not shown.
BIN
Start_Mac/macos-x64/libunity.a
Normal file
BIN
Start_Mac/macos-x64/libunity.a
Normal file
Binary file not shown.
BIN
Start_Mac/macos-x64/libwordsalad.a
Normal file
BIN
Start_Mac/macos-x64/libwordsalad.a
Normal file
Binary file not shown.
BIN
Start_Mac/macos-x64/libwordsalad_complete.a
Normal file
BIN
Start_Mac/macos-x64/libwordsalad_complete.a
Normal file
Binary file not shown.
0
Start_Windows/Microsoft Word-Dokument (neu).docx
Normal file
0
Start_Windows/Microsoft Word-Dokument (neu).docx
Normal file
11
Start_Windows/VSS Code.code-workspace
Normal file
11
Start_Windows/VSS Code.code-workspace
Normal file
@ -0,0 +1,11 @@
|
||||
{
|
||||
"folders": [
|
||||
{
|
||||
"path": "../../../Documents/Wichtiges/Arbeit/Kalenderjahr 2025/Trainingscenter/4.Woche/VSS Code"
|
||||
},
|
||||
{
|
||||
"path": "../../../VSS"
|
||||
}
|
||||
],
|
||||
"settings": {}
|
||||
}
|
||||
@ -6,18 +6,116 @@
|
||||
#define MAX_RAND_TRIES_PER_WORD 10
|
||||
#define EMPTY_CHAR 0
|
||||
|
||||
//TODO: Spiellogik implementieren:
|
||||
// TODO: Spiellogik implementieren:
|
||||
/* * Wörter aus der Wortliste zufällig horizontal oder vertikal platzieren
|
||||
* restliche Felder mit zufälligen Buchstaben füllen */
|
||||
* 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)
|
||||
{
|
||||
srand(time(NULL));
|
||||
// wipe field
|
||||
int placedWords = 0;
|
||||
for (int i = 0; i < searchFieldLen; i++)
|
||||
{
|
||||
for (int j = 0; j < searchFieldLen ; j++)
|
||||
salad[i][j] = EMPTY_CHAR;
|
||||
}
|
||||
// place Words
|
||||
for (int wordNumber = 0; wordNumber < wordCount; wordNumber++)
|
||||
{
|
||||
int wordlength = strlen(words[wordNumber]);
|
||||
|
||||
int placed = 0;
|
||||
|
||||
for (int try = 0; (try < MAX_RAND_TRIES_PER_WORD) && !placed; try++)
|
||||
{
|
||||
int horizontal = rand() % 2; // 0 vertikal --> 1 horizontal
|
||||
|
||||
int x = rand() % searchFieldLen;
|
||||
int y = rand() % searchFieldLen;
|
||||
|
||||
if (horizontal)
|
||||
{
|
||||
if (x + wordlength > searchFieldLen) // word does not fit
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
int fits = 1;
|
||||
|
||||
for (int i = 0; i < wordlength; i++) // position already occupied by other word
|
||||
{
|
||||
if (salad[y][x + i] != EMPTY_CHAR)
|
||||
{
|
||||
fits = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (fits)
|
||||
{
|
||||
for (int i = 0; i < wordlength; i++)
|
||||
{
|
||||
salad[y][x + i] = words[wordNumber][i];
|
||||
}
|
||||
placed = 1;
|
||||
placedWords++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((y + wordlength) > searchFieldLen)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
int fits = 1;
|
||||
|
||||
for (int i = 0; i < wordlength; i++) // position already occupied by other word
|
||||
{
|
||||
if (salad[y + i][x] != EMPTY_CHAR)
|
||||
{
|
||||
fits = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (fits)
|
||||
{
|
||||
for (int i = 0; i < wordlength; i++)
|
||||
{
|
||||
salad[y + i][x] = words[wordNumber][i];
|
||||
}
|
||||
placed = 1;
|
||||
placedWords++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// fill rest with random characters
|
||||
|
||||
for (int i = 0; i < searchFieldLen; i++)
|
||||
{
|
||||
for (int j = 0; j < searchFieldLen; j++)
|
||||
{
|
||||
if (salad[i][j] == EMPTY_CHAR)
|
||||
{
|
||||
salad[i][j] = rand() % ('Z' - 'A' + 1) + 'A'; // 90 ist Z in ASCII und A ist 65
|
||||
}
|
||||
}
|
||||
}
|
||||
return placedWords;
|
||||
}
|
||||
|
||||
// Prints the word salad to console
|
||||
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 j = 0; j < searchFieldLen; j++)
|
||||
{
|
||||
printf("%c", salad[i][j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BIN
Start_Windows/game.o
Normal file
BIN
Start_Windows/game.o
Normal file
Binary file not shown.
BIN
Start_Windows/graphicalGame.o
Normal file
BIN
Start_Windows/graphicalGame.o
Normal file
Binary file not shown.
@ -8,5 +8,35 @@
|
||||
// Read words from file and store in 'words' array
|
||||
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
|
||||
{
|
||||
//kein fopen und fclose nötig, weil dies schon in der main passiert und mit *file übergeben wird//
|
||||
|
||||
|
||||
if (file == NULL)
|
||||
{
|
||||
perror("Error invalid pointer to file");
|
||||
return -1;
|
||||
}
|
||||
|
||||
char line[1024];
|
||||
unsigned int count = 0;
|
||||
|
||||
while (fgets(line, sizeof(line), file) && (count < maxWordCount))
|
||||
{
|
||||
line[strcspn(line, "\n")] = '\0';
|
||||
|
||||
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, " ;,");
|
||||
}
|
||||
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
BIN
Start_Windows/input.o
Normal file
BIN
Start_Windows/input.o
Normal file
Binary file not shown.
@ -12,7 +12,7 @@ int main(int argc, char *argv[])
|
||||
int exitCode = EXIT_SUCCESS;
|
||||
|
||||
// Check if the correct number of arguments is provided
|
||||
if(argc != 2)
|
||||
if (argc != 2)
|
||||
{
|
||||
fprintf(stderr, "Usage: %s <path to file with search words>\n", argv[0]);
|
||||
exitCode = EXIT_FAILURE;
|
||||
@ -24,7 +24,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
FILE *file = fopen(argv[1], "r");
|
||||
|
||||
if(file != NULL)
|
||||
if (file != NULL)
|
||||
{
|
||||
unsigned int placedWords = 0;
|
||||
char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad
|
||||
@ -40,7 +40,14 @@ int main(int argc, char *argv[])
|
||||
// Check if all words were successfully placed
|
||||
// Start the game if successful
|
||||
// error message if some words couldn't be placed
|
||||
|
||||
if (wordCount != placedWords)
|
||||
{
|
||||
fprintf(stderr, "Error: %u out of %u were placed\n", placedWords, wordCount);
|
||||
}
|
||||
else
|
||||
{
|
||||
startGame(wordSalad, SALAD_SIZE, words, placedWords, 1024);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
BIN
Start_Windows/main.o
Normal file
BIN
Start_Windows/main.o
Normal file
Binary file not shown.
@ -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
|
||||
# --------------------------
|
||||
|
||||
BIN
Start_Windows/runTests.exe
Normal file
BIN
Start_Windows/runTests.exe
Normal file
Binary file not shown.
@ -1,5 +1,3 @@
|
||||
Yeti,Nessie Werwolf; Vampir
|
||||
Monster
|
||||
Hydra;Frankenstein
|
||||
Dracula;KingKong;Gremlin;Kobold,Hexe;Poltergeist
|
||||
Gespenst, Oger
|
||||
Multiplikation, Division, Addition, Subtraktion, Term
|
||||
Bruch
|
||||
Nenner, Zaehler, Daten, Saeulendiagramm
|
||||
BIN
Start_Windows/wordsalad_initial.exe
Normal file
BIN
Start_Windows/wordsalad_initial.exe
Normal file
Binary file not shown.
BIN
Start_Windows/wordsalad_myversion.exe
Normal file
BIN
Start_Windows/wordsalad_myversion.exe
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user