Fix win/draw logic

iHiD · iHiD · commit 538404c7a703 · 2025-06-04T11:57:29.000+09:00
diff --git a/bootcamp_content/projects/tic-tac-toe/exercises/ticky-tac/example.js b/bootcamp_content/projects/tic-tac-toe/exercises/ticky-tac/example.js
@@ -45,6 +45,15 @@ function checkForDraw() {
   }
 }
 
+function checkForGameOver() {
+  checkForWin()
+  if (gameOver) {
+    return
+  }
+
+  checkForDraw()
+}
+
 function toggleTurn() {
   turn = turn == 'o' ? 'x' : 'o'
 }
@@ -65,7 +74,6 @@ function handlePlacement(event) {
   square.content = turn
   square.elem.innerHTML = turn
 
-  checkForWin()
-  checkForDraw()
+  checkForGameOver()
   toggleTurn()
 }

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,15 @@ function checkForDraw() {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
	`48`	`+function checkForGameOver() {`
	`49`	`+ checkForWin()`
	`50`	`+ if (gameOver) {`
	`51`	`+ return`
	`52`	`+ }`
	`53`	`+`
	`54`	`+ checkForDraw()`
	`55`	`+}`
	`56`	`+`
`48`	`57`	`function toggleTurn() {`
`49`	`58`	`turn = turn == 'o' ? 'x' : 'o'`
`50`	`59`	`}`
`@@ -65,7 +74,6 @@ function handlePlacement(event) {`
`65`	`74`	`square.content = turn`
`66`	`75`	`square.elem.innerHTML = turn`
`67`	`76`
`68`		`- checkForWin()`
`69`		`- checkForDraw()`
	`77`	`+ checkForGameOver()`
`70`	`78`	`toggleTurn()`
`71`	`79`	`}`