Version 0.6

Also, moved Print*() methods to separate class.

LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2023 W0LF aka 'dreamforce'
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1 +1,5 @@
-Игра "Быки и Коровы" (C++)
+
+# Игра "Быки и Коровы" (C++)
+
+Здесь должно быть<br>
+описание игры.

bulls-and-cows-cpp/CGame.cpp

@@ -1,34 +1,40 @@
-// Bulls and Cows the game
+// Bulls and Cows the game
 // CGame.cpp
 //
+#include "defines.h"
 #include "CGame.h"
+#include "CUserInput.h"
+#include "CPrint.h"
+#include <iostream>
+#include <random>
 
 void CGame::Init()
 {
+	m_nBulls = 0;
+	m_nCows = 0;
+	m_nStepCounter = 0;
 	m_fGameIsEnd = false;
-	m_ucBulls = 0;
-	m_ucCows = 0;
-	m_uStepCounter = 0;
 	m_sLastError = L"";
 
 	std::random_device r;
 	std::default_random_engine e(r());
 	std::uniform_int_distribution<int> d(0, 9);
 
-	m_uGuessedNumber = new int[m_ucDigits] { 0 };
+	m_nGuessedNumber = new int[m_nDigits] { 0 };
+
 	int n = 0;
 
-	for (int i = 0; i < m_ucDigits; ++i)
+	for (int i = 0; i < m_nDigits; ++i)
 	{
 		n = d(e);
 		if (i > 0)
 		{
-			while (IsEqual(m_uGuessedNumber, n, i))
+			while (IsEqual(m_nGuessedNumber, n, i))
 			{
 				n = d(e);
 			}
 		}
-		m_uGuessedNumber[i] = n;
+		m_nGuessedNumber[i] = n;
 	}
 }
 
@@ -42,26 +48,26 @@ void CGame::Start()
 	{
 		do
 		{
-			PrintGameHeader();
-			ShowGuessedNumber(IS_SHOW);
-			PrintSteps();
+			CPrint::GameHeader();
+			CPrint::GuessedNumber(this, IS_SHOW);
+			CPrint::Steps(this);
 		} while (!GetNumber(step));
 
-		m_uStepCounter++;
+		m_nStepCounter++;
 	}
 
-	PrintGameHeader();
-	ShowGuessedNumber(true);
-	PrintSteps();
-	PrintGameFooter();
+	CPrint::GameHeader();
+	CPrint::GuessedNumber(this, true);
+	CPrint::Steps(this);
+	CPrint::GameFooter(this);
 }
 
 bool CGame::GetNumber(CStep step)
 {
 	std::wcout << L"\t\t\t\t\t" << m_sLastError << L"\r";
-	std::wcout << L"=>\t";
+	std::wcout << "=>\t";
 
-	CUserInput userInput(m_ucDigits);
+	CUserInput userInput(m_nDigits);
 
 	if (userInput.Get())
 	{
@@ -69,71 +75,27 @@ bool CGame::GetNumber(CStep step)
 		{
 			if (IsEqual(userInput.m_vUserInput, userInput.m_vUserInput.at(i), i))
 			{
-				m_sLastError = L"Цифры в числе не должны повторяться!";
+				m_sLastError = strERROR_1;
 				return false;
 			}
 		}
 	}
 	else
 	{
-		m_sLastError = L"Вы должны ввести " + std::to_wstring(m_ucDigits) + L"-значное число!";
+		m_sLastError = strERROR_2_1 + std::to_wstring(m_nDigits) + strERROR_2_2;
 		return false;
 	}
 
 	step.StoreStepNumber(userInput.m_vUserInput);
-	step.CheckForAnimals(m_uGuessedNumber, m_ucDigits);
-	m_Steps.push_back(step);
+	step.CheckForAnimals(m_nGuessedNumber, m_nDigits);
+	m_vSteps.push_back(step);
 
-	if (step.GetStepAnimals().first == m_ucDigits) m_fGameIsEnd = true;
+	if (step.GetStepAnimals().first == m_nDigits) m_fGameIsEnd = true;
 
 	m_sLastError = L"";
 	return true;
 }
 
-void CGame::ShowGuessedNumber(bool show)
-{
-	std::wcout << '\t';
-	for (int i = 0; i < m_ucDigits; ++i)
-	{
-		show ? std::wcout << m_uGuessedNumber[i] : std::wcout << '#';
-	}
-	std::wcout << '\n' << '\t';
-
-	for (int i = 0; i < m_ucDigits; ++i)
-	{
-		std::wcout << '-';
-	}
-	std::wcout << std::endl;
-}
-
-void CGame::PrintGameHeader()
-{
-	std::system("cls");
-	std::wcout << L"Быки и Коровы." << ' ' << L"Версия" << ' ' << VERSION << std::endl;
-	std::wcout << L"Copyright (c) 2023 by W0LF aka 'dreamforce'" << "\n\n" << std::endl;
-}
-
-void CGame::PrintGameFooter()
-{
-	std::wcout << L"\n\n\t" << L"!!!   П О Б Е Д А   !!!" << std::endl;
-	std::wcout << L"\tКоличество ходов: " << m_uStepCounter << L"\n\n" << std::endl;
-}
-
-void CGame::PrintSteps()
-{
-	if (m_Steps.size() < 1) return;
-
-	for (CStep& s : m_Steps)
-	{
-		std::wstring stepNumber = L"\0";
-		for (int& d : s.GetStepNumber())
-		{
-			stepNumber += std::to_wstring(d);
-		}
-		std::wcout << '\t' << stepNumber << '\t' << s.GetStepAnimals().first << L" Б., " << s.GetStepAnimals().second << L" К." << std::endl;
-	}
-}
-
 CGame::CGame()
 {
 	CUserInput userInput(1);
@@ -142,16 +104,15 @@ CGame::CGame()
 
 	do
 	{
-		PrintGameHeader();
-		std::wcout << L"Введите количество цифр в числе (от 3 до 5).\n";
-		std::wcout << L"Чем больше цифр - тем сложнее. Обычно 4.\n\n";
-		std::wcout << L"=> ";
+		CPrint::GameHeader();
+		CPrint::GameInitialQuery();
+		std::wcout << "=> ";
 
 		if (userInput.Get())
 		{
 			if ((userInput.m_vUserInput.at(0) >= 3) && (userInput.m_vUserInput.at(0) <= 5))
 			{
-				m_ucDigits = userInput.m_vUserInput.at(0);
+				m_nDigits = userInput.m_vUserInput.at(0);
 				ok = true;
 			}
 			else
@@ -164,5 +125,5 @@ CGame::CGame()
 
 CGame::~CGame()
 {
-	delete[] m_uGuessedNumber;
+	delete[] m_nGuessedNumber;
 }

bulls-and-cows-cpp/CGame.h

@@ -2,32 +2,28 @@
 // CGame.h
 //
 #pragma once
-#include "headers.h"
-#include "CUserInput.h"
 #include "CStep.h"
+#include <string>
 
 class CGame
 {
 private:
-	int m_ucDigits = 4;		// Number of digits into the guessed number
-	int m_ucBulls;
-	int m_ucCows;
+	int m_nBulls;
+	int m_nCows;
 	bool m_fGameIsEnd;
-	int m_uStepCounter;
-	int* m_uGuessedNumber;
 	std::wstring m_sLastError;
-	std::vector<CStep> m_Steps;
 
 	bool GetNumber(CStep);
-	void ShowGuessedNumber(bool);
-	void PrintGameHeader();
-	void PrintGameFooter();
-	void PrintSteps();
 
 	template<typename T, typename N>
 	bool IsEqual(const T, const N, int);
 
 public:
+	int m_nDigits;			// Number of digits into the guessed number
+	int m_nStepCounter;
+	int* m_nGuessedNumber;
+	std::vector<CStep> m_vSteps;
+
 	void Init();
 	void Start();
 	CGame();

bulls-and-cows-cpp/CPrint.cpp

@@ -0,0 +1,54 @@
+// Bulls and Cows the game
+// CPrint.cpp
+//
+#include "CPrint.h"
+#include "defines.h"
+#include <iostream>
+
+void CPrint::GameInitialQuery()
+{
+	std::wcout << strINITIAL_QUERY_1;
+	std::wcout << strINITIAL_QUERY_2 << std::endl;
+}
+
+void CPrint::GameHeader()
+{
+	std::system("cls");
+	std::wcout << strGAME_NAME << ' ' << strGAME_VERSION << ' ' << VERSION << std::endl;
+	std::wcout << strGAME_COPYRIGHT << "\n\n" << std::endl;
+}
+
+void CPrint::GameFooter(CGame* const game)
+{
+	std::wcout << "\n\n\t" << strVICTORY << std::endl;
+	std::wcout << strNUM_STEPS << game->m_nStepCounter << "\n\n" << std::endl;
+}
+
+void CPrint::Steps(CGame* const game)
+{
+	if (game->m_vSteps.size() < 1) return;
+
+	for (CStep& s : game->m_vSteps)
+	{
+		std::wcout << '\t';
+		for (int& d : s.GetStepNumber()) std::wcout << d;
+		std::wcout << '\t' << s.GetStepAnimals().first << strBULLS << s.GetStepAnimals().second << strCOWS;
+		std::wcout << std::endl;
+	}
+}
+
+void CPrint::GuessedNumber(CGame* const game, const bool show)
+{
+	std::wcout << '\t';
+	for (int i = 0; i < game->m_nDigits; ++i)
+	{
+		show ? std::wcout << game->m_nGuessedNumber[i] : std::wcout << '#';
+	}
+	std::wcout << '\n' << '\t';
+
+	for (int i = 0; i < game->m_nDigits; ++i)
+	{
+		std::wcout << '-';
+	}
+	std::wcout << std::endl;
+}

bulls-and-cows-cpp/CPrint.h

@@ -0,0 +1,15 @@
+// Bulls and Cows the game
+// CPrint.h
+//
+#pragma once
+#include "CGame.h"
+
+class CPrint
+{
+public:
+	static void GameInitialQuery();
+	static void GameHeader();
+	static void GameFooter(CGame* const);
+	static void Steps(CGame* const);
+	static void GuessedNumber(CGame* const, const bool);
+};

bulls-and-cows-cpp/CStep.cpp

@@ -5,38 +5,38 @@
 
 void CStep::StoreStepNumber(std::vector<int>& digits)
 {
-	m_uStepNumber = digits;
+	m_nStepNumber = digits;
 }
 
 void CStep::CheckForAnimals(const int* digits, int size)
 {
 	int b = 0, c = 0;
 
-	for (size_t i = 0; i < size; i++)		// m_uGuessedNumber
+	for (size_t i = 0; i < size; i++)		// m_nGuessedNumber
 	{
-		for (size_t j = 0; j < size; j++)	// m_uStepNumber
+		for (size_t j = 0; j < size; j++)	// m_nStepNumber
 		{
-			if ((m_uStepNumber[i] == digits[j]) && (i == j))
+			if ((m_nStepNumber[i] == digits[j]) && (i == j))
 			{
 				b++;
 			}
-			else if (m_uStepNumber[i] == digits[j])
+			else if (m_nStepNumber[i] == digits[j])
 			{
 				c++;
 			}
 
 		}
 	}
-	m_uStepAnimals.first = b;
-	m_uStepAnimals.second = c;
+	m_nStepAnimals.first = b;
+	m_nStepAnimals.second = c;
 }
 
 std::vector<int> CStep::GetStepNumber()
 {
-	return m_uStepNumber;
+	return m_nStepNumber;
 }
 
 std::pair<int, int> CStep::GetStepAnimals()
 {
-	return m_uStepAnimals;
+	return m_nStepAnimals;
 }

bulls-and-cows-cpp/CStep.h

@@ -2,13 +2,13 @@
 // CStep.h
 //
 #pragma once
-#include "headers.h"
+#include <vector>
 
 class CStep
 {
 private:
-	std::vector<int> m_uStepNumber;
-	std::pair<int, int> m_uStepAnimals;
+	std::vector<int> m_nStepNumber;
+	std::pair<int, int> m_nStepAnimals;
 
 public:
 	void StoreStepNumber(std::vector<int>&);

bulls-and-cows-cpp/CUserInput.cpp

@@ -2,10 +2,13 @@
 // CUserInput.cpp
 //
 #include "CUserInput.h"
+#include <iostream>
+#include <string>
+#include <cwctype>
 
-CUserInput::CUserInput(int nNumOfDigits)
+CUserInput::CUserInput(int numOfDigits)
 {
-	m_nNumOfExpectedDigits = nNumOfDigits;
+	m_nNumOfExpectedDigits = numOfDigits;
 }
 
 bool CUserInput::Get()

bulls-and-cows-cpp/CUserInput.h

@@ -2,7 +2,7 @@
 // CUserInput.h
 //
 #pragma once
-#include "headers.h"
+#include <vector>
 
 class CUserInput
 {
@@ -10,6 +10,6 @@ public:
 	int m_nNumOfExpectedDigits;
 	std::vector<int> m_vUserInput;
 
-	CUserInput(int nNumOfExpectedDigits);
+	CUserInput(int);
 	bool Get();
 };

bulls-and-cows-cpp/SetUserLocale.cpp

@@ -0,0 +1,22 @@
+// SetUserLocale.cpp
+//
+#include <iostream>
+#include <windows.h>
+
+bool SetUserLocale(void)
+{
+	bool ret = false;
+	wchar_t localeName[LOCALE_NAME_MAX_LENGTH]{ 0 };
+	if (GetUserDefaultLocaleName(localeName, LOCALE_NAME_MAX_LENGTH))
+	{
+		_wsetlocale(LC_ALL, localeName);
+		ret = true;
+	}
+	else
+	{
+		DWORD ec = GetLastError();
+		std::wcout << L"GetUserDefaultLocaleName() failed! Error: " << ec << std::endl;
+		ret = false;
+	}
+	return ret;
+}

bulls-and-cows-cpp/SetUserLocale.h

@@ -0,0 +1,7 @@
+// SetUserLocale.h
+//
+#pragma once
+#ifndef SETUSERLOCALE_H
+#define SETUSERLOCALE_H
+bool SetUserLocale(void);
+#endif // SETUSERLOCALE_H

bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj

@@ -77,6 +77,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <DisableSpecificWarnings>4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -130,19 +131,23 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\MyFunctions\SetUserLocale.cpp" />
     <ClCompile Include="bulls-and-cows.cpp" />
     <ClCompile Include="CGame.cpp" />
+    <ClCompile Include="CPrint.cpp" />
     <ClCompile Include="CStep.cpp" />
     <ClCompile Include="CUserInput.cpp" />
+    <ClCompile Include="SetUserLocale.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\MyFunctions\SetUserLocale.h" />
     <ClInclude Include="CGame.h" />
+    <ClInclude Include="CPrint.h" />
     <ClInclude Include="CStep.h" />
     <ClInclude Include="CUserInput.h" />
     <ClInclude Include="defines.h" />
-    <ClInclude Include="headers.h" />
+    <ClInclude Include="SetUserLocale.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="LICENSE" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj.filters

@@ -30,6 +30,9 @@
     <ClCompile Include="CUserInput.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="CPrint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CGame.h">
@@ -47,8 +50,11 @@
     <ClInclude Include="defines.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="headers.h">
+    <ClInclude Include="CPrint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="LICENSE" />
+  </ItemGroup>
 </Project>

bulls-and-cows-cpp/bulls-and-cows.cpp

@@ -1,8 +1,7 @@
 // Bulls and Cows the game
 // bulls-and-cows.cpp
 //
-#include "headers.h"
-#include "..\..\..\MyFunctions\SetUserLocale.h"
+#include "SetUserLocale.h"
 #include "CGame.h"
 
 int wmain(int argc, wchar_t* argv[])

bulls-and-cows-cpp/defines.h

@@ -1,11 +1,28 @@
-// Bulls and Cows the game
+// Bulls and Cows the game
 // defines.h
 //
 #pragma once
-#define VERSION 0.4
+#define VERSION 0.6
 
 #ifdef _DEBUG
 #define IS_SHOW true
 #else
 #define IS_SHOW false
 #endif
+
+#define strERROR_1 L"Цифры в числе не должны повторяться!"
+#define strERROR_2_1 L"Вы должны ввести "
+#define strERROR_2_2 L"-значное число!"
+
+#define strBULLS L" Б., "
+#define strCOWS L" К."
+
+#define strINITIAL_QUERY_1 L"Введите количество цифр в числе (от 3 до 5).\n"
+#define strINITIAL_QUERY_2 L"Чем больше цифр - тем сложнее. Обычно 4.\n"
+
+#define strGAME_NAME L"Быки и Коровы."
+#define strGAME_VERSION L"Версия"
+#define strGAME_COPYRIGHT L"Copyright (c) 2023 W0LF aka 'dreamforce'"
+
+#define strVICTORY L"!!!   П О Б Е Д А   !!!"
+#define strNUM_STEPS L"\tКоличество ходов: "

bulls-and-cows-cpp/headers.h

@@ -1,12 +0,0 @@
-// Bulls and Cows the game
-// headers.h
-//
-#pragma once
-#include <Windows.h>
-#include <iostream>
-#include <random>
-#include <string>
-#include <vector>
-#include <cwctype>
-
-#include "defines.h"