Merge branch 'master' of https://codefirst.iut.uca.fr/git/jeremy.mouyon/sae201_qwirkle
continuous-integration/drone/push Build is passing Details

test_old_branch
Jérémy Mouyon 12 months ago
commit 84218a78e2

@ -6,7 +6,7 @@ PROJECT_NAME = "QwirkleProject"
PROJECT_NUMBER = 1.0.0 PROJECT_NUMBER = 1.0.0
PROJECT_BRIEF = "Projet realisé avec Jules Lascret, Remy Portet, Jérémy Mouyon (leader)" PROJECT_BRIEF = "Projet realisé avec Jules Lascret, Remy Portet, Jérémy Mouyon (leader)"
PROJECT_LOGO = images/mylogo.png PROJECT_LOGO = images/mylogo.png
OUTPUT_DIRECTORY = /Documentations/doxygen OUTPUT_DIRECTORY = /docs/doxygen
CREATE_SUBDIRS = NO CREATE_SUBDIRS = NO
ALLOW_UNICODE_NAMES = NO ALLOW_UNICODE_NAMES = NO
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English
@ -125,7 +125,7 @@ WARN_LOGFILE =
# Configuration options related to the input files # Configuration options related to the input files
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
INPUT = ../../Sources INPUT = Qwirkle
INPUT_ENCODING = UTF-8 INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.c \ FILE_PATTERNS = *.c \
*.cc \ *.cc \
@ -223,10 +223,10 @@ GENERATE_HTML = YES
HTML_OUTPUT = html HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html HTML_FILE_EXTENSION = .html
HTML_HEADER = HTML_HEADER =
HTML_FOOTER = footer.html HTML_FOOTER =
HTML_STYLESHEET = HTML_STYLESHEET =
HTML_EXTRA_STYLESHEET = HTML_EXTRA_STYLESHEET =
HTML_EXTRA_FILES = images/CodeFirst.png images/clubinfo.png HTML_EXTRA_FILES =
HTML_COLORSTYLE_HUE = 215 HTML_COLORSTYLE_HUE = 215
HTML_COLORSTYLE_SAT = 45 HTML_COLORSTYLE_SAT = 45
HTML_COLORSTYLE_GAMMA = 240 HTML_COLORSTYLE_GAMMA = 240

@ -30,15 +30,13 @@ namespace QwirkleClassLibrary
{ {
for (int i = 0; i < cells.Count; i++) for (int i = 0; i < cells.Count; i++)
{ {
if (this.cells[i].GetX == x && this.cells[i].GetY == y) if (this.cells[i].GetX != x || this.cells[i].GetY != y) continue;
{
if (cells[i].IsFree == true) if (cells[i].IsFree == true)
{ {
return cells[i].SetTile(tile); return cells[i].SetTile(tile);
} }
} }
}
return false; return false;
} }
} }

Loading…
Cancel
Save