Moved string literals to the defines.h header.

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

bulls-and-cows-cpp/CGame.cpp

@@ -1,14 +1,19 @@
-// 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_fGameIsEnd = false;
 	m_ucBulls = 0;
 	m_ucCows = 0;
 	m_uStepCounter = 0;
+	m_fGameIsEnd = false;
 	m_sLastError = L"";
 
 	std::random_device r;
@@ -16,6 +21,7 @@ void CGame::Init()
 	std::uniform_int_distribution<int> d(0, 9);
 
 	m_uGuessedNumber = new int[m_ucDigits] { 0 };
+
 	int n = 0;
 
 	for (int i = 0; i < m_ucDigits; ++i)
@@ -42,24 +48,24 @@ void CGame::Start()
 	{
 		do
 		{
-			PrintGameHeader();
-			ShowGuessedNumber(IS_SHOW);
-			PrintSteps();
+			CPrint::GameHeader();
+			CPrint::GuessedNumber(this, IS_SHOW);
+			CPrint::Steps(this);
 		} while (!GetNumber(step));
 
 		m_uStepCounter++;
 	}
 
-	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);
 
@@ -69,14 +75,14 @@ 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_ucDigits) + strERROR_2_2;
 		return false;
 	}
 
@@ -90,50 +96,6 @@ bool CGame::GetNumber(CStep step)
 	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,10 +104,9 @@ 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())
 		{

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;
 	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_ucDigits;			// Number of digits into the guessed number
+	int m_uStepCounter;
+	int* m_uGuessedNumber;
+	std::vector<CStep> m_Steps;
+
 	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_uStepCounter << "\n\n" << std::endl;
+}
+
+void CPrint::Steps(CGame* const game)
+{
+	if (game->m_Steps.size() < 1) return;
+
+	for (CStep& s : game->m_Steps)
+	{
+		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_ucDigits; ++i)
+	{
+		show ? std::wcout << game->m_uGuessedNumber[i] : std::wcout << '#';
+	}
+	std::wcout << '\n' << '\t';
+
+	for (int i = 0; i < game->m_ucDigits; ++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.h

@@ -2,7 +2,7 @@
 // CStep.h
 //
 #pragma once
-#include "headers.h"
+#include <vector>
 
 class CStep
 {

bulls-and-cows-cpp/CUserInput.cpp

@@ -2,6 +2,9 @@
 // CUserInput.cpp
 //
 #include "CUserInput.h"
+#include <iostream>
+#include <string>
+#include <cwctype>
 
 CUserInput::CUserInput(int nNumOfDigits)
 {

bulls-and-cows-cpp/CUserInput.h

@@ -2,7 +2,7 @@
 // CUserInput.h
 //
 #pragma once
-#include "headers.h"
+#include <vector>
 
 class CUserInput
 {

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>
@@ -133,16 +134,17 @@
     <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" />
   </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" />
   </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,7 +50,7 @@
     <ClInclude Include="defines.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="headers.h">
+    <ClInclude Include="CPrint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

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

@@ -1,7 +1,6 @@
 // Bulls and Cows the game
 // bulls-and-cows.cpp
 //
-#include "headers.h"
 #include "..\..\..\MyFunctions\SetUserLocale.h"
 #include "CGame.h"
 

bulls-and-cows-cpp/defines.h

@@ -1,4 +1,4 @@
-// Bulls and Cows the game
+// Bulls and Cows the game
 // defines.h
 //
 #pragma once
@@ -9,3 +9,20 @@
 #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 by 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"