generated from freudenreichan/info2Praktikum-Wortsalat
Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c93da286b9 | ||
|
|
3e9dddae10 | ||
|
|
a1f73a0e33 | ||
|
|
8d8cb57e79 | ||
|
|
93c4f16ebc | ||
|
|
510fec5852 | ||
|
|
343cc291ec | ||
|
|
e815ad3822 | ||
|
|
e7cdff98cb |
No files matched your search
+6
-1
@@ -1 +1,6 @@
|
|||||||
Start_Linux/wordsalad_initial
|
wordsalad_initial
|
||||||
|
runTests
|
||||||
|
.vscode
|
||||||
|
*.o
|
||||||
|
*.exe
|
||||||
|
wordsalad
|
||||||
@@ -21,3 +21,8 @@ void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN],
|
|||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Fill up Word salad
|
||||||
|
void fillWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]){
|
||||||
|
|
||||||
|
}
|
||||||
+60
-3
@@ -1,12 +1,69 @@
|
|||||||
|
/*
|
||||||
|
----- input.c--------------------------------------------------------
|
||||||
|
Description: ReadWords: Takes a file and separates all the words from one another, returns the wordcount and an array with all words
|
||||||
|
Project: Praktikum Informatik 2
|
||||||
|
Author: kobma99134@th-nuernberg.de
|
||||||
|
Date: 05-11-2025
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
// TODO:
|
|
||||||
// eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
|
|
||||||
|
|
||||||
// Read words from file and store in 'words' array
|
// Read words from file and store in 'words' array
|
||||||
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
|
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
|
||||||
{
|
{
|
||||||
|
// checks, if the file acually exists
|
||||||
|
if (file == NULL) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
//return value: wordcount, as in the number of words that are being read
|
||||||
|
int wordcount = 0;
|
||||||
|
char readLine[MAX_LINE_LEN];
|
||||||
|
|
||||||
|
// collects the words line by line and adds them to the list, if its not exceeding the max word count
|
||||||
|
while (fgets(readLine, sizeof(readLine), file) != (NULL && wordcount < maxWordCount)) {
|
||||||
|
|
||||||
|
char word[MAX_WORD_LEN];
|
||||||
|
int wordIndex = 0;
|
||||||
|
|
||||||
|
//reads every character in the line from start to finish, until the Enter key ('\0')
|
||||||
|
for (int i = 0; readLine[i] != '\0'; i++) {
|
||||||
|
|
||||||
|
// is the character a letter from the alphabet?
|
||||||
|
if(isalpha(readLine[i])) {
|
||||||
|
if (wordIndex < MAX_WORD_LEN) {
|
||||||
|
// clean code: We want only uppercase or only lowercase letters to avoid future problems...
|
||||||
|
word[wordIndex++] = toupper(readLine[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
//if its not a letter, it has to be another character dividing two words e.g. ' ', ',', ';' etc.
|
||||||
|
if (wordIndex > 0) {
|
||||||
|
// we want a full word, not an empty string
|
||||||
|
word[wordIndex] = '\0';
|
||||||
|
// add the word to the wordlist
|
||||||
|
strcpy(words[wordcount], word);
|
||||||
|
wordcount++;
|
||||||
|
wordIndex = 0;
|
||||||
|
|
||||||
|
if (wordcount >= maxWordCount) {
|
||||||
|
return wordcount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Edge case: If the last word ends on a '\0', right after the last letter
|
||||||
|
if (wordIndex > 0 && wordcount < maxWordCount) {
|
||||||
|
word[wordIndex] = '\0';
|
||||||
|
strcp(words[wordcount], word);
|
||||||
|
wordcount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
// regular case: return the total number of words
|
||||||
|
return wordcount;
|
||||||
}
|
}
|
||||||
@@ -6,12 +6,6 @@ BINARIES = ./linux
|
|||||||
raylibfolder = ./raylib
|
raylibfolder = ./raylib
|
||||||
unityfolder = ./unity
|
unityfolder = ./unity
|
||||||
|
|
||||||
# --------------------------
|
|
||||||
# initiales Spiel bauen
|
|
||||||
# --------------------------
|
|
||||||
wordsalad_initial:
|
|
||||||
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
|
||||||
|
|
||||||
# --------------------------
|
# --------------------------
|
||||||
# Normales Spiel bauen
|
# Normales Spiel bauen
|
||||||
# --------------------------
|
# --------------------------
|
||||||
@@ -30,6 +24,13 @@ game.o: game.c
|
|||||||
graphicalGame.o: graphicalGame.c
|
graphicalGame.o: graphicalGame.c
|
||||||
$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c
|
$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c
|
||||||
|
|
||||||
|
|
||||||
|
# --------------------------
|
||||||
|
# initiales Spiel bauen
|
||||||
|
# --------------------------
|
||||||
|
wordsalad_initial:
|
||||||
|
$(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
|
||||||
|
|
||||||
# --------------------------
|
# --------------------------
|
||||||
# Unit Tests
|
# Unit Tests
|
||||||
# --------------------------
|
# --------------------------
|
||||||
@@ -38,6 +39,7 @@ TEST_BIN = runTests
|
|||||||
test: input.o game.o unit_tests.c
|
test: input.o game.o unit_tests.c
|
||||||
$(CC) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
|
$(CC) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a
|
||||||
|
|
||||||
|
|
||||||
# --------------------------
|
# --------------------------
|
||||||
# Clean
|
# Clean
|
||||||
# --------------------------
|
# --------------------------
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
## Todo
|
||||||
|
#### game.c
|
||||||
|
_Vorgegebene Anweisung:_
|
||||||
|
Wörter aus der Wortliste zufällig horizontal oder vertikal plazieren, restliche Felder mit zufälligen Buchstaben füllen
|
||||||
|
#### input.c
|
||||||
|
_Vorgegebene Anweisung:_
|
||||||
|
eine Funktion implementierenm die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt
|
||||||
|
=> Die Methode sollte Fertig sein, ist aber noch nicht getestet.
|
||||||
|
#### main.c
|
||||||
|
_Vorgegebene Anweisung:_
|
||||||
|
Check if all words were successfully placed
|
||||||
|
start the game if successfull
|
||||||
|
error message if some words couldn't be placed
|
||||||
Reference in new issue
Block a user