updated files in StartMac

This commit is contained in:
Jonas Urban 2025-10-21 15:00:57 +02:00
parent 2579dede52
commit c745cdd148
6 changed files with 44 additions and 27 deletions

7
.gitignore vendored Normal file
View File

@ -0,0 +1,7 @@
I2_Wortsalat/.DS_Store
I2_Wortsalat/Start_Mac/game.c
I2_Wortsalat/Start_Mac/game.o
I2_Wortsalat/Start_Mac/input.o
I2_Wortsalat/Start_Mac/main.o
I2_Wortsalat/Start_Mac/runTests
I2_Wortsalat/Start_Mac/wordsalad_initial

BIN
I2_Wortsalat/Start_Mac/.DS_Store vendored Normal file

Binary file not shown.

View File

@ -19,5 +19,11 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
// 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 j = 0; j < searchFieldLen; j++ )
{
printf("%c", salad[i][j]);
}
}
} }

View File

@ -38,13 +38,20 @@ int main(int argc, char *argv[])
// TODO: // TODO:
// Check if all words were successfully placed // Check if all words were successfully placed
// Start the game if successful if(placedWords == wordCount)
// error message if some words couldn't be placed {
printf("Eingabe war erfolgreich!\nDas Spiel beginnt:");
void startGame(wordSalad, searchFieldSize, words, numberOfWords, windowSize);
}
else
{
printf("Fehler! Es konnten nicht alle Woerter hinzugefuegt werden!\n Bitte Spiel neustarten!");
}
} }
else else
{ {
// Print error message if file couldn't be opened // Print error message if file couldn't be opened
fprintf(stderr, "Could not open file %s for reading ...\n", argv[1]); fprintf(stderr, "Could not open file %s for reading ...\n", argv[1]);
exitCode = EXIT_FAILURE; exitCode = EXIT_FAILURE;
} }

View File

@ -3,44 +3,46 @@ CFLAGS = -g -Wall
LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -framework IOKit -framework Cocoa -framework CoreVideo LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -framework IOKit -framework Cocoa -framework CoreVideo
ARCH := $(shell uname -m) ARCH := $(shell uname -m)
BINARIES = ./macos-$(ARCH) BINARIES = ./macos-$(ARCH)
raylibfolder = ./raylib
raylib_folder = ./raylib
unityfolder = ./unity unityfolder = ./unity
# -------------------------- # --------------------------
# initiales Spiel bauen # initiales Spiel bauen
# -------------------------- # --------------------------
wordsalad_initial: wordsalad_initial:
$(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
# -------------------------- # --------------------------
# Normales Spiel bauen # Normales Spiel bauen
# -------------------------- # --------------------------
wordsalad: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a wordsalad: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a
$(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS) $(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS)
main.o: main.c main.o: main.c
$(CC) -c $(CFLAGS) main.c $(CC) -c $(CFLAGS) main.c
input.o: input.c input.o: input.c
$(CC) -c $(CFLAGS) input.c $(CC) -c $(CFLAGS) input.c
game.o: game.c game.o: game.c
$(CC) -c $(CFLAGS) game.c $(CC) -c $(CFLAGS) game.c
graphicalGame.o: graphicalGame.c graphicalGame.o: graphicalGame.c
$(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c $(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c
# -------------------------- # --------------------------
# Unit Tests # Unit Tests
# -------------------------- # --------------------------
TEST_BIN = runTests TEST_BIN = runTests
test: input.o game.o unit_tests.c $(BINARIES)/libunity.a test: input.o game.o unit_tests.c $(BINARIES)/libunity.a
$(CC) -Wall -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a $(CC) -Wall -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
# -------------------------- # --------------------------
# Clean # Clean
# -------------------------- # --------------------------
clean: clean:
rm -f *.o wordsalad rm -f *.o wordsalad $(TEST_BIN)

View File

@ -41,17 +41,12 @@ int main(int argc, char *argv[])
if(placedWords == wordCount) if(placedWords == wordCount)
{ {
printf("Eingabe war erfolgreich!\nDas Spiel beginnt:"); printf("Eingabe war erfolgreich!\nDas Spiel beginnt:");
void startGame(wordSalad[][], searchFieldSize, words[][], numberOfWords, windowSize) void startGame(wordSalad, searchFieldSize, words, numberOfWords, windowSize);
} }
else else
{ {
printf("Fehler! Es konnten nicht alle Woerter hinzugefuegt werden!\n Bitte Spiel neustarten!"); printf("Fehler! Es konnten nicht alle Woerter hinzugefuegt werden!\n Bitte Spiel neustarten!");
} }
// Start the game if successful
// error message if some words couldn't be placed
} }
else else
{ {