wiesendsi102436/info2Praktikum-Wortsalat
1
0
Fork 0
forked from freudenreichan/info2Praktikum-Wortsalat
Code Issues Pull Requests Releases Activity

Compare commits

base: wiesendsi102436:b4f891d3310f0109e7dc4e462e4363325885ee98
Branches Tags
wiesendsi102436:main
wiesendsi102436:simon
freudenreichan:main
...
compare: wiesendsi102436:b9ca7ff70cab060ee4da585e1e5e089e1587bb90
Branches Tags
wiesendsi102436:main
wiesendsi102436:simon
freudenreichan:main

2 Commits
b4f891d331 ... b9ca7ff70c

Author SHA1 Message Date
Simon Wiesend
b9ca7ff70c
simplify gitignore 2025-11-06 19:31:09 +01:00
Simon Wiesend
02134e96e6
set game up to start if some words could not be fitted into the grid 2025-11-06 19:29:40 +01:00
7 changed files with 156 additions and 108 deletions
Show Stats Expand all files Collapse all files

8
.gitignore vendored
View File

@ -1,12 +1,8 @@
wordsalad_initial wordsalad_initial
game.o
input.o
runTests runTests
main.o
graphicalGame.o
wordsalad wordsalad
wordsalad_initial.exe *.o
runTests.exe *.exe
testwords_delims.txt testwords_delims.txt
testwords_empty.txt testwords_empty.txt
testwords_simple.txt testwords_simple.txt

66
Start_Linux/game.c
View File

@ -11,71 +11,91 @@
* 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 // 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, char words[][MAX_WORD_LEN], unsigned int wordCount)
{ {
int row, col, placedWords = 0; int row, col, placedWords = 0;
// Gesamtes Feld auf 0 setzen // Gesamtes Feld auf 0 setzen
for (row=0; row < searchFieldLen; row++) { for (row = 0; row < searchFieldLen; row++)
for (col=0; col < searchFieldLen; col++) { {
for (col = 0; col < searchFieldLen; col++)
{
salad[row][col] = EMPTY_CHAR; salad[row][col] = EMPTY_CHAR;
} }
} }
// Wortlänge wird für jedes Wort erfasst // Wortlänge wird für jedes Wort erfasst
for (int w=0; w< wordCount; w++) { for (int w = 0; w < wordCount; w++)
{
const char *word = words[w]; const char *word = words[w];
int wordLen = strlen(word); int wordLen = strlen(word);
if (wordLen == 0 || wordLen > searchFieldLen) { if (wordLen == 0 || wordLen > searchFieldLen)
{
continue; continue;
} }
int placed = 0; int placed = 0;
for (int tries = 0; tries < MAX_RAND_TRIES_PER_WORD && !placed; tries++) { for (int tries = 0; tries < MAX_RAND_TRIES_PER_WORD && !placed; tries++)
{
int dir = (rand() % 2); // 0 oder 1 zur Festlegung von vertikal oder horizontal int dir = (rand() % 2); // 0 oder 1 zur Festlegung von vertikal oder horizontal
row = 0; row = 0;
col = 0; col = 0;
if (dir == 0) { //horizontal //Startpunkt so festlegen, dass Wort nicht aus Feld raus ragt if (dir == 0)
{ // horizontal //Startpunkt so festlegen, dass Wort nicht aus Feld raus ragt
row = rand() % searchFieldLen; row = rand() % searchFieldLen;
col = rand() % (searchFieldLen - wordLen + 1); col = rand() % (searchFieldLen - wordLen + 1);
} else { //vertikal }
else
{ // vertikal
row = rand() % (searchFieldLen - wordLen + 1); row = rand() % (searchFieldLen - wordLen + 1);
col = rand() % searchFieldLen; col = rand() % searchFieldLen;
} }
int placeable = 1; int placeable = 1;
for (int i = 0; i < wordLen; i++) { //Felder ab Startpunkt werden durchgegangen und gecheckt, ob Felder auf Null sind: for (int i = 0; i < wordLen; i++)
{ // Felder ab Startpunkt werden durchgegangen und gecheckt, ob Felder auf Null sind:
// JA =>Wort wird im nächsten Schritt platziert, NEIN => Abbruch, Neuer Startpunkt wird festgelegt // JA =>Wort wird im nächsten Schritt platziert, NEIN => Abbruch, Neuer Startpunkt wird festgelegt
if ((dir == 0 && salad[row][col + i] != EMPTY_CHAR) || (dir == 1 && salad[row + i][col] != EMPTY_CHAR)) { if ((dir == 0 && salad[row][col + i] != EMPTY_CHAR) || (dir == 1 && salad[row + i][col] != EMPTY_CHAR))
{
placeable = 0; placeable = 0;
break; break;
} }
} }
if (placeable) { //wenn es keine Überschneidungen gibt, wird Wort platziert if (placeable)
for (int i=0; i<wordLen; i++) { { // wenn es keine Überschneidungen gibt, wird Wort platziert
if (dir == 0) { for (int i = 0; i < wordLen; i++)
{
if (dir == 0)
{
salad[row][col + i] = word[i]; salad[row][col + i] = word[i];
} else { }
else
{
salad[row + i][col] = word[i]; salad[row + i][col] = word[i];
} }
} }
// copy actually placed words to the front of the array
// it's safe to use strcpy here
strcpy(words[placedWords], word);
placed = 1; placed = 1;
placedWords++; placedWords++;
} }
} }
} }
// Felder, in denen keine Buchstaben stehen, werden mit zufälligen Buchstaben befüllt // Felder, in denen keine Buchstaben stehen, werden mit zufälligen Buchstaben befüllt
for (row=0; row < searchFieldLen; row++) { for (row = 0; row < searchFieldLen; row++)
for (col=0; col < searchFieldLen; col++) { {
if (salad[row][col] == EMPTY_CHAR) { for (col = 0; col < searchFieldLen; col++)
{
if (salad[row][col] == EMPTY_CHAR)
{
salad[row][col] = 'A' + (rand() % 26); salad[row][col] = 'A' + (rand() % 26);
} }
} }
@ -90,8 +110,10 @@ void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN],
int row, col; int row, col;
// Ausgabe des gesamten Feldes // Ausgabe des gesamten Feldes
for (row=0; row < searchFieldLen; row++) { for (row = 0; row < searchFieldLen; row++)
for (col=0; col < searchFieldLen; col++) { {
for (col = 0; col < searchFieldLen; col++)
{
printf("%c ", salad[row][col]); printf("%c ", salad[row][col]);
} }
printf("\n"); printf("\n");

2
Start_Linux/game.h
View File

@ -5,7 +5,7 @@
#define MAX_SEARCH_FIELD_LEN 100 #define MAX_SEARCH_FIELD_LEN 100
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, char words[][MAX_WORD_LEN], unsigned int wordCount);
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);
#endif #endif

10
Start_Linux/main.c
View File

@ -42,14 +42,18 @@ int main(int argc, char *argv[])
{ {
int notPlacedNum = wordCount - placedWords; int notPlacedNum = wordCount - placedWords;
fprintf(stderr, "%d word(s) couldn't be placed\n", notPlacedNum); fprintf(stderr, "%d word(s) couldn't be placed\n", notPlacedNum);
exitCode = EXIT_FAILURE;
} }
// Start the game if all words were successfully placed // Start game if at least 1 word was successfully placed
else if (placedWords > 0)
{ {
startGame(wordSalad, SALAD_SIZE, words, wordCount, 800); startGame(wordSalad, SALAD_SIZE, words, wordCount, 800);
} }
else
{
fprintf(stderr, "no word could be placed");
exitCode = EXIT_FAILURE;
}
} }
else else
{ {

66
Start_Windows/game.c
View File

@ -11,71 +11,91 @@
* 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 // 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, char words[][MAX_WORD_LEN], unsigned int wordCount)
{ {
int row, col, placedWords = 0; int row, col, placedWords = 0;
// Gesamtes Feld auf 0 setzen // Gesamtes Feld auf 0 setzen
for (row=0; row < searchFieldLen; row++) { for (row = 0; row < searchFieldLen; row++)
for (col=0; col < searchFieldLen; col++) { {
for (col = 0; col < searchFieldLen; col++)
{
salad[row][col] = EMPTY_CHAR; salad[row][col] = EMPTY_CHAR;
} }
} }
// Wortlänge wird für jedes Wort erfasst // Wortlänge wird für jedes Wort erfasst
for (int w=0; w< wordCount; w++) { for (int w = 0; w < wordCount; w++)
{
const char *word = words[w]; const char *word = words[w];
int wordLen = strlen(word); int wordLen = strlen(word);
if (wordLen == 0 || wordLen > searchFieldLen) { if (wordLen == 0 || wordLen > searchFieldLen)
{
continue; continue;
} }
int placed = 0; int placed = 0;
for (int tries = 0; tries < MAX_RAND_TRIES_PER_WORD && !placed; tries++) { for (int tries = 0; tries < MAX_RAND_TRIES_PER_WORD && !placed; tries++)
{
int dir = (rand() % 2); // 0 oder 1 zur Festlegung von vertikal oder horizontal int dir = (rand() % 2); // 0 oder 1 zur Festlegung von vertikal oder horizontal
row = 0; row = 0;
col = 0; col = 0;
if (dir == 0) { //horizontal //Startpunkt so festlegen, dass Wort nicht aus Feld raus ragt if (dir == 0)
{ // horizontal //Startpunkt so festlegen, dass Wort nicht aus Feld raus ragt
row = rand() % searchFieldLen; row = rand() % searchFieldLen;
col = rand() % (searchFieldLen - wordLen + 1); col = rand() % (searchFieldLen - wordLen + 1);
} else { //vertikal }
else
{ // vertikal
row = rand() % (searchFieldLen - wordLen + 1); row = rand() % (searchFieldLen - wordLen + 1);
col = rand() % searchFieldLen; col = rand() % searchFieldLen;
} }
int placeable = 1; int placeable = 1;
for (int i = 0; i < wordLen; i++) { //Felder ab Startpunkt werden durchgegangen und gecheckt, ob Felder auf Null sind: for (int i = 0; i < wordLen; i++)
{ // Felder ab Startpunkt werden durchgegangen und gecheckt, ob Felder auf Null sind:
// JA =>Wort wird im nächsten Schritt platziert, NEIN => Abbruch, Neuer Startpunkt wird festgelegt // JA =>Wort wird im nächsten Schritt platziert, NEIN => Abbruch, Neuer Startpunkt wird festgelegt
if ((dir == 0 && salad[row][col + i] != EMPTY_CHAR) || (dir == 1 && salad[row + i][col] != EMPTY_CHAR)) { if ((dir == 0 && salad[row][col + i] != EMPTY_CHAR) || (dir == 1 && salad[row + i][col] != EMPTY_CHAR))
{
placeable = 0; placeable = 0;
break; break;
} }
} }
if (placeable) { //wenn es keine Überschneidungen gibt, wird Wort platziert if (placeable)
for (int i=0; i<wordLen; i++) { { // wenn es keine Überschneidungen gibt, wird Wort platziert
if (dir == 0) { for (int i = 0; i < wordLen; i++)
{
if (dir == 0)
{
salad[row][col + i] = word[i]; salad[row][col + i] = word[i];
} else { }
else
{
salad[row + i][col] = word[i]; salad[row + i][col] = word[i];
} }
} }
// copy actually placed words to the front of the array
// it's safe to use strcpy here
strcpy(words[placedWords], word);
placed = 1; placed = 1;
placedWords++; placedWords++;
} }
} }
} }
// Felder, in denen keine Buchstaben stehen, werden mit zufälligen Buchstaben befüllt // Felder, in denen keine Buchstaben stehen, werden mit zufälligen Buchstaben befüllt
for (row=0; row < searchFieldLen; row++) { for (row = 0; row < searchFieldLen; row++)
for (col=0; col < searchFieldLen; col++) { {
if (salad[row][col] == EMPTY_CHAR) { for (col = 0; col < searchFieldLen; col++)
{
if (salad[row][col] == EMPTY_CHAR)
{
salad[row][col] = 'A' + (rand() % 26); salad[row][col] = 'A' + (rand() % 26);
} }
} }
@ -90,8 +110,10 @@ void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN],
int row, col; int row, col;
// Ausgabe des gesamten Feldes // Ausgabe des gesamten Feldes
for (row=0; row < searchFieldLen; row++) { for (row = 0; row < searchFieldLen; row++)
for (col=0; col < searchFieldLen; col++) { {
for (col = 0; col < searchFieldLen; col++)
{
printf("%c ", salad[row][col]); printf("%c ", salad[row][col]);
} }
printf("\n"); printf("\n");

2
Start_Windows/game.h
View File

@ -5,7 +5,7 @@
#define MAX_SEARCH_FIELD_LEN 100 #define MAX_SEARCH_FIELD_LEN 100
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, char words[][MAX_WORD_LEN], unsigned int wordCount);
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);
#endif #endif

10
Start_Windows/main.c
View File

@ -42,14 +42,18 @@ int main(int argc, char *argv[])
{ {
int notPlacedNum = wordCount - placedWords; int notPlacedNum = wordCount - placedWords;
fprintf(stderr, "%d word(s) couldn't be placed\n", notPlacedNum); fprintf(stderr, "%d word(s) couldn't be placed\n", notPlacedNum);
exitCode = EXIT_FAILURE;
} }
// Start the game if all words were successfully placed // Start game if at least 1 word was successfully placed
else if (placedWords > 0)
{ {
startGame(wordSalad, SALAD_SIZE, words, wordCount, 800); startGame(wordSalad, SALAD_SIZE, words, wordCount, 800);
} }
else
{
fprintf(stderr, "no word could be placed");
exitCode = EXIT_FAILURE;
}
} }
else else
{ {