forked from freudenreichan/info2Praktikum-Wortsalat
wieder zurück,
This commit is contained in:
1 parent
b62d4a7b8c
commit
acc2a77b74
2 files changed
+5
-3
No files matched your search
+3
-1
@@ -3,12 +3,14 @@
|
|||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
#include "graphicalGame.h"
|
#include "graphicalGame.h"
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
#define MAX_NUMBER_OF_WORDS 100
|
#define MAX_NUMBER_OF_WORDS 100
|
||||||
#define SALAD_SIZE 20
|
#define SALAD_SIZE 20
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
srand(time(NULL));
|
||||||
int exitCode = EXIT_SUCCESS;
|
int exitCode = EXIT_SUCCESS;
|
||||||
|
|
||||||
// Check if the correct number of arguments is provided
|
// Check if the correct number of arguments is provided
|
||||||
@@ -40,7 +42,7 @@ int main(int argc, char *argv[])
|
|||||||
// Check if all words were successfully placed
|
// Check if all words were successfully placed
|
||||||
// Start the game if successful
|
// Start the game if successful
|
||||||
// error message if some words couldn't be placed
|
// error message if some words couldn't be placed
|
||||||
if (placedWords == wordCount)
|
if (placedWords == wordCount) // WEnn alle WÖrter reinpassen, rufe das grafische Fenster auf
|
||||||
{
|
{
|
||||||
// Start the graphical game with the generated word salad
|
// Start the graphical game with the generated word salad
|
||||||
startGame(wordSalad, SALAD_SIZE, words, wordCount, 800);
|
startGame(wordSalad, SALAD_SIZE, words, wordCount, 800);
|
||||||
|
|||||||
+2
-2
@@ -21,8 +21,8 @@ codefolder = .
|
|||||||
# --------------------------
|
# --------------------------
|
||||||
wordsalad_initial:
|
wordsalad_initial:
|
||||||
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
||||||
wordsalad_myversion: main.o
|
wordsalad_myversion: main.o game.o graphicalGame.o
|
||||||
$(CC) -o wordsalad_myversion main.o -L. $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
$(CC) $(CFLAGS) -o wordsalad_myversion main.o game.o graphicalGame.o -L. $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
||||||
|
|
||||||
# --------------------------
|
# --------------------------
|
||||||
# Normales Spiel bauen
|
# Normales Spiel bauen
|
||||||
|
|||||||
Reference in new issue
Block a user