9 Commits
17 changed files with 471 additions and 8 deletions

No files matched your search

+276
View File
@@ -0,0 +1,276 @@
# Created by https://www.toptal.com/developers/gitignore/api/linux,windows,macos,visualstudiocode,clion,eclipse
# Edit at https://www.toptal.com/developers/gitignore?templates=linux,windows,macos,visualstudiocode,clion,eclipse
### CLion ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# AWS User-specific
.idea/**/aws.xml
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# SonarLint plugin
.idea/sonarlint/
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
### CLion Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr
# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/
# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml
# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/
# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$
# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml
# Azure Toolkit for IntelliJ plugin
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
.idea/**/azureSettings.xml
### Eclipse ###
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# PyDev specific (Python IDE for Eclipse)
*.pydevproject
# CDT-specific (C/C++ Development Tooling)
.cproject
# CDT- autotools
.autotools
# Java annotation processor (APT)
.factorypath
# PDT-specific (PHP Development Tools)
.buildpath
# sbteclipse plugin
.target
# Tern plugin
.tern-project
# TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans
# Code Recommenders
.recommenders/
# Annotation Processing
.apt_generated/
.apt_generated_test/
# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet
# Uncomment this line if you wish to ignore the project description file.
# Typically, this file would be tracked if it contains build/dependency configurations:
#.project
### Eclipse Patch ###
# Spring Boot Tooling
.sts4-cache/
### Linux ###
*~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences
.directory
# Linux trash folder which might appear on any partition or disk
.Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### macOS Patch ###
# iCloud generated files
*.icloud
### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets
# Local History for Visual Studio Code
.history/
# Built Visual Studio Code Extensions
*.vsix
### VisualStudioCode Patch ###
# Ignore all local history of files
.history
.ionide
### Windows ###
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db
# Dump file
*.stackdump
# Folder config file
[Dd]esktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp
# Windows shortcuts
*.lnk
# End of https://www.toptal.com/developers/gitignore/api/linux,windows,macos,visualstudiocode,clion,eclipse
+110 -1
View File
@@ -1,7 +1,7 @@
#include "game.h"
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#define MAX_RAND_TRIES_PER_WORD 10
#define EMPTY_CHAR 0
@@ -13,5 +13,114 @@
// 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)
{
unsigned int placedWords = 0;
//printf("start game.c\n");
emptyField(searchFieldLen, salad);
for(int i = 0; i < wordCount; i++)
{
placedWords += placement(salad, searchFieldLen, words[i]);
//printf("[%d] of words: %s\n", i, words[i]);
}
fillRandAlpha(searchFieldLen, salad);
printf("placedWords:%d\n", placedWords);
for(int i = 0; i < searchFieldLen; i++)
{
for(int j = 0; j < searchFieldLen; j++)
{
printf("%c", salad[j][i]);
}
printf("\n");
}
return placedWords;
}
char alphaRand()
{
int letter = (rand() % 26) + 'A';
return (char) letter;
}
int placement(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char *word)
{
int saladX = rand() % ( searchFieldLen - strlen(word) );
int saladY = rand() % ( searchFieldLen - strlen(word) );
printf("%s\n", word);
if(rand() % 2)
{
for(int i = 0; i < strlen(word); i++)
{
if(isalpha(salad[saladX][saladY + i]))
{
return 0;
}
}
for(int i = 0; i < strlen(word); i++)
{
salad[saladX][saladY + i] = word[i];
}
}
else
{
for(int i = 0; i < strlen(word); i++)
{
if(isalpha(salad[saladX + i][saladY]))
{
return 0;
}
}
for(int i = 0; i < strlen(word); i++)
{
salad[saladX + i][saladY] = word[i];
}
}
return 1;
}
void emptyField(unsigned int searchFieldLen, char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN])
{
for(size_t i = 0; i < searchFieldLen; i++)
{
for(size_t j = 0; j < searchFieldLen; j++)
{
//salad[i][j] = '\0';
salad[i][j] = ' ';
printf("%c", salad[i][j]);
}
printf("\n");
}
}
char fillRandAlpha(unsigned int searchFieldLen, char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN])
{
for(size_t i = 0; i < searchFieldLen; i++)
{
for(size_t j = 0; j < searchFieldLen; j++)
{
if(!isalpha(salad[i][j]))
{
salad[i][j] = alphaRand();
//printf("%c", salad[i][j]);
}
}
printf("\n");
}
return 0;
}
+8
View File
@@ -7,4 +7,12 @@
int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount);
void emptyField(unsigned int searchFieldLen, char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]);
char fillRandAlpha(unsigned int searchFieldLen, char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]);
int placement(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char *word);
char alphaRand();
#endif
BIN
View File
Binary file not shown.
Binary file not shown.
+46 -1
View File
@@ -2,11 +2,56 @@
#include <string.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
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
{
printf("start readWords\n");
int wordcount = 0;
char buffer[256];
char *line = fgets(buffer, sizeof(buffer), file);
}
while(line != NULL)
{
printf("%d. loop\n", wordcount);
printf("line: %s\n", line);
char* word = strtok(line, " ,;");
while (word != NULL)
{
strncpy(words[wordcount], word, strlen(word));
//printf("%d. word: %s\n", wordcount, words[wordcount]);
wordcount += 1;
word = strtok(NULL, " ,;\t\n");
}
line = fgets(buffer, sizeof(buffer), file);
}
for(int i = 0; i < wordcount; i++)
{
for(int j = 0; j < strlen(words[i]); j++)
{
words[i][j] = toupper(words[i][j]);
if(words[i][j] == '\n')
{
words[i][j] = '\0';
}
}
printf("%d. word: %s\n", i, words[i]);
}
printf("wordcount = %d\n", wordcount);
return wordcount;
}
BIN
View File
Binary file not shown.
+23 -5
View File
@@ -3,6 +3,9 @@
#include "input.h"
#include "game.h"
#include "graphicalGame.h"
#include <errno.h>
#include <time.h>
#define MAX_NUMBER_OF_WORDS 100
#define SALAD_SIZE 20
@@ -10,7 +13,9 @@
int main(int argc, char *argv[])
{
int exitCode = EXIT_SUCCESS;
printf("start main\n");
srand(time(NULL));
// Check if the correct number of arguments is provided
if(argc != 2)
{
@@ -34,13 +39,26 @@ int main(int argc, char *argv[])
fclose(file);
// Create the word salad by placing words into grid
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
//placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
// TODO:
// Check if all words were successfully placed
// Start the game if successful
// error message if some words couldn't be placed
for(int i = 0; i < 10000; i++)
{
placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
if(placedWords == wordCount)
{
// Start the game if successful
return exitCode;
}
}
// error message if some words couldn't be placed
fprintf(stderr, "could not start wordsalad.\n");
exitCode = EXIT_FAILURE;
}
else
{
@@ -51,4 +69,4 @@ int main(int argc, char *argv[])
}
return exitCode;
}
}
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
Hund,Katze; Maus
View File
Whitespace-only changes.
+3
View File
@@ -0,0 +1,3 @@
Apfel
Banane
Kiwi
+3
View File
@@ -49,6 +49,8 @@ void test_readWords_with_delimiters(void) {
int count = readWords(f, words, 10);
fclose(f);
char cwd[PATH_MAX];
TEST_ASSERT_EQUAL_INT(3, count);
TEST_ASSERT_EQUAL_STRING("HUND", words[0]);
TEST_ASSERT_EQUAL_STRING("KATZE", words[1]);
@@ -171,3 +173,4 @@ int main(void) {
return result;
}
+1 -1
View File
@@ -2,4 +2,4 @@ Yeti,Nessie Werwolf; Vampir
Monster
Hydra;Frankenstein
Dracula;KingKong;Gremlin;Kobold,Hexe;Poltergeist
Gespenst, Oger
Gespenst, Oger
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.