diff --git a/Start_Windows/game.c b/Start_Windows/game.c index e903bc8..f749cf2 100644 --- a/Start_Windows/game.c +++ b/Start_Windows/game.c @@ -13,7 +13,7 @@ // 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) { -Printf("Hello World"); +Printf("Hello World+1"); } // Prints the word salad to console diff --git a/Start_Windows/input.o b/Start_Windows/input.o new file mode 100644 index 0000000..2cb4bd7 Binary files /dev/null and b/Start_Windows/input.o differ diff --git a/Start_Windows/main.c b/Start_Windows/main.c index 03da755..552ec79 100644 --- a/Start_Windows/main.c +++ b/Start_Windows/main.c @@ -40,6 +40,10 @@ 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: %d out of %d were placed", placedWords, wordCount); + } } else @@ -48,6 +52,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Could not open file %s for reading ...\n", argv[1]); exitCode = EXIT_FAILURE; } + startGame(words) } return exitCode; diff --git a/Start_Windows/makefile b/Start_Windows/makefile index 146a8c6..88dc4a4 100644 --- a/Start_Windows/makefile +++ b/Start_Windows/makefile @@ -1,9 +1,9 @@ CC = gcc -CFLAGS = -g -Wall -I$(raylibfolder) +CFLAGS = -g -Wall LDFLAGS = -lopengl32 -lgdi32 -lwinmm BINARIES = ./windows -raylib_folder = ./raylib +raylibfolder = ./raylib unityfolder = ./unity # -------------------------- @@ -12,24 +12,23 @@ unityfolder = ./unity wordsalad_initial: $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) - # -------------------------- # Normales Spiel bauen # -------------------------- all: 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) - + main.o: main.c $(CC) -c $(CFLAGS) main.c input.o: input.c - $(CC) -c $(CFLAGS)input.c + $(CC) -c $(CFLAGS) input.c game.o: game.c $(CC) -c $(CFLAGS) game.c graphicalGame.o: graphicalGame.c - $(CC) -I$(raylib_folder) -c $(CFLAGS) graphicalGame.c + $(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c # -------------------------- # Unit Tests diff --git a/Start_Windows/wordsalad_initial.exe b/Start_Windows/wordsalad_initial.exe new file mode 100644 index 0000000..bcedf54 Binary files /dev/null and b/Start_Windows/wordsalad_initial.exe differ