forked from freudenreichan/info2Praktikum-Wortsalat
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
138aa9b820 | ||
|
|
3fc54ae264 | ||
|
|
fa28bc4965 | ||
|
|
f825ee0131 | ||
|
|
683b1cdf7e | ||
|
|
df82424793 | ||
|
|
572f312fa5 | ||
|
|
b4db35ec2a | ||
|
|
2364d9f187 | ||
|
|
aed0be1dca | ||
|
|
42a5d91205 |
No files matched your search
@@ -37,6 +37,7 @@
|
|||||||
*.hex
|
*.hex
|
||||||
Startcode/wordsalad_initial
|
Startcode/wordsalad_initial
|
||||||
Startcode/wordsalad
|
Startcode/wordsalad
|
||||||
|
Startcode/wordsalad_myversion
|
||||||
test
|
test
|
||||||
|
|
||||||
# Debug files
|
# Debug files
|
||||||
|
|||||||
+10
-2
@@ -36,8 +36,16 @@ int main(int argc, char *argv[])
|
|||||||
// Create the word salad by placing words into grid
|
// Create the word salad by placing words into grid
|
||||||
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
|
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
|
||||||
|
|
||||||
// TODO:
|
if(placedWords==wordCount){ //checked if all words were succesfully placed
|
||||||
// Check if all words were successfully placed
|
startGame(wordSalad, SALAD_SIZE, words, wordCount, 1000); // Starting the game
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
printf("Fehler! Es konnten nicht alle Wörter plaziert werden\n"); //Error if some words couldnt be placed
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// DONE
|
||||||
|
// Check if all words were successfully placed3
|
||||||
// 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
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,12 @@ game.o: $(codefolder)/game.c
|
|||||||
graphicalGame.o: $(codefolder)/graphicalGame.c
|
graphicalGame.o: $(codefolder)/graphicalGame.c
|
||||||
$(CC) -I$(raylibfolder) -c $(CFLAGS) $(codefolder)/graphicalGame.c
|
$(CC) -I$(raylibfolder) -c $(CFLAGS) $(codefolder)/graphicalGame.c
|
||||||
|
|
||||||
|
# --------------------------
|
||||||
|
# mein Spiel bauen
|
||||||
|
#---------------------------
|
||||||
|
wordsalad_myversion: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a
|
||||||
|
$(CC) $(CFLAGS) -o wordsalad_myversion main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# --------------------------
|
# --------------------------
|
||||||
# Unit Tests
|
# Unit Tests
|
||||||
|
|||||||
Reference in new issue
Block a user