Fix scoring for repeated letters

trevorg16 · Aug 4, 2022 · caec7f1 · caec7f1
1 parent d4d6aab
commit caec7f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/engine.cc b/engine.cc
@@ -98,8 +98,6 @@ BOOL Engine::makeGuess(char* word)
 	{
 		return FALSE;
 	}
-
-	printf("Guess: %s, selected: %s\n", word, selectedWord);
 
 	BOOL letterScore[WORD_LENGTH] = {FALSE};
 
@@ -127,12 +125,13 @@ BOOL Engine::makeGuess(char* word)
 	// Wrong position but correct guess
 	for (i = 0; i < WORD_LENGTH; i++)
 	{
-		char* foundLoc = strchr(selectedWord, word[i]);
-
-		if (foundLoc && letterScore[foundLoc - selectedWord] == FALSE)
+		for (int j = 0; j < WORD_LENGTH; j++)
 		{
-			scores[numGuesses][i] = WrongPos;
-			letterScore[foundLoc - selectedWord] = TRUE;
+			if (word[i] == selectedWord[j] && !letterScore[j] && scores[numGuesses][i] == NoMatch)
+			{
+				scores[numGuesses][i] = WrongPos;
+				letterScore[j] = TRUE;
+			}
 		}
 	}
 

diff --git a/macwords.r b/macwords.r
diff --git a/ui_main.cc b/ui_main.cc
@@ -428,7 +428,7 @@ void drawAboutWindow(WindowPtr window)
 
 	DrawString(writeString);
 
-	c2pstrcpy_cust(writeString, " v1.0.0");
+	c2pstrcpy_cust(writeString, " v1.0.1");
 
 	DrawString(writeString);