diff --git a/.gitignore.txt b/.gitignore.txt
new file mode 100644
index 0000000..25a7384
--- /dev/null
+++ b/.gitignore.txt
@@ -0,0 +1,2 @@
+*.o
+*.exe
diff --git a/.idea/Wortsalat_SchGehNeu.iml b/.idea/Wortsalat_SchGehNeu.iml
index bc2cd87..4c94235 100644
--- a/.idea/Wortsalat_SchGehNeu.iml
+++ b/.idea/Wortsalat_SchGehNeu.iml
@@ -1,8 +1,2 @@
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Start_Windows/.idea/.gitignore b/Start_Windows/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/Start_Windows/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/Start_Windows/.idea/editor.xml b/Start_Windows/.idea/editor.xml
deleted file mode 100644
index 8434d3b..0000000
--- a/Start_Windows/.idea/editor.xml
+++ /dev/null
@@ -1,580 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Start_Windows/.idea/misc.xml b/Start_Windows/.idea/misc.xml
deleted file mode 100644
index 53624c9..0000000
--- a/Start_Windows/.idea/misc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Start_Windows/.idea/vcs.xml b/Start_Windows/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/Start_Windows/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Start_Windows/.idea/workspace.xml b/Start_Windows/.idea/workspace.xml
new file mode 100644
index 0000000..38de7c6
--- /dev/null
+++ b/Start_Windows/.idea/workspace.xml
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "associatedIndex": 3
+}
+
+
+
+
+
+ {
+ "keyToString": {
+ "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "Makefile Target.makefile.executor": "Run",
+ "Native Application.all.executor": "Run",
+ "RunOnceActivity.RadMigrateCodeStyle": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "RunOnceActivity.readMode.enableVisualFormatting": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "cf.first.check.clang-format": "false",
+ "cidr.known.project.marker": "true",
+ "git-widget-placeholder": "version__john",
+ "ignore.virus.scanning.warn.message": "true",
+ "last_opened_file_path": "C:/Users/johnp/info2_Praktikum/Wortsalat_SchGehNeu/Start_Windows",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "settings.editor.selected.configurable": "MakefileSettings",
+ "vue.rearranger.settings.migration": "true"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1761247259751
+
+
+ 1761247259751
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Start_Windows/main.c b/Start_Windows/main.c
index daa30ea..151f041 100644
--- a/Start_Windows/main.c
+++ b/Start_Windows/main.c
@@ -5,11 +5,10 @@
#include "graphicalGame.h"
-//test änderung john.n
-
#define MAX_NUMBER_OF_WORDS 100
#define SALAD_SIZE 20
+#define windowWith 800
int main(int argc, char *argv[])
{
@@ -41,9 +40,15 @@ int main(int argc, char *argv[])
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
// TODO:
- // Check if all words were successfully placed
+ // Check if all words were successfully place
+ if (wordCount == placedWords) {
// Start the game if successful
+ startGame(wordSalad, SALAD_SIZE, words, wordCount, windowWith);
+ }else {
// error message if some words couldn't be placed
+ printf("some words couldn't be placed");
+ exitCode = EXIT_FAILURE;
+ }
}
else
diff --git a/Start_Windows/makefile b/Start_Windows/makefile
index 72cccb7..6dcca6e 100644
--- a/Start_Windows/makefile
+++ b/Start_Windows/makefile
@@ -10,7 +10,11 @@ unityfolder = ./unity
# initiales Spiel bauen
# --------------------------
wordsalad_initial:
- $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
+ $(CC) -o wordsalad_initial $(CC) $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
+
+
+wordsalad_myversion:
+ $(CC) -o wordsalad_myversion -c $(CFLAGS) main.c $(BINARIES)/libraylib.a $(LDFLAGS)
# --------------------------
# Normales Spiel bauen
diff --git a/Start_Windows/wordsalad_myversion b/Start_Windows/wordsalad_myversion
new file mode 100644
index 0000000..b86266d
Binary files /dev/null and b/Start_Windows/wordsalad_myversion differ
diff --git a/Start_Windows/wordsalad_myversion.exe b/Start_Windows/wordsalad_myversion.exe
new file mode 100644
index 0000000..631bdf4
Binary files /dev/null and b/Start_Windows/wordsalad_myversion.exe differ