From 7669dff7a683a52fb574aad92928cf015fe1fa8b Mon Sep 17 00:00:00 2001
From: W0LF <dreamforce@yandex.ru>
Date: Wed, 2 Aug 2023 23:01:19 +0300
Subject: [PATCH] Moved header's includes into separete header file.

---
 bulls-and-cows-cpp/CGame.cpp                          |  6 ++++--
 bulls-and-cows-cpp/CGame.h                            |  2 +-
 bulls-and-cows-cpp/CStep.h                            |  2 +-
 bulls-and-cows-cpp/CUserInput.h                       |  6 +-----
 bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj         |  1 +
 bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj.filters |  3 +++
 bulls-and-cows-cpp/bulls-and-cows.cpp                 |  2 +-
 bulls-and-cows-cpp/defines.h                          |  2 ++
 bulls-and-cows-cpp/headers.h                          | 11 +++++++++++
 9 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 bulls-and-cows-cpp/headers.h

diff --git a/bulls-and-cows-cpp/CGame.cpp b/bulls-and-cows-cpp/CGame.cpp
index 8942a39..f6db310 100644
--- a/bulls-and-cows-cpp/CGame.cpp
+++ b/bulls-and-cows-cpp/CGame.cpp
@@ -1,8 +1,6 @@
 // CGame.cpp
 //
 #include "CGame.h"
-#include "CUserInput.h"
-#include <random>
 
 void CGame::Init()
 {
@@ -43,7 +41,11 @@ void CGame::Start()
 		do
 		{
 			PrintGameHeader();
+#ifdef _DEBUG
+			ShowGuessedNumber(true);
+#else
 			ShowGuessedNumber(false);
+#endif // DEBUG
 			PrintSteps();
 			ret = GetNumber(step);
 			switch (ret)
diff --git a/bulls-and-cows-cpp/CGame.h b/bulls-and-cows-cpp/CGame.h
index 483237c..0f87f94 100644
--- a/bulls-and-cows-cpp/CGame.h
+++ b/bulls-and-cows-cpp/CGame.h
@@ -1,7 +1,7 @@
 // CGame.h
 //
 #pragma once
-#include "defines.h"
+#include "headers.h"
 #include "CUserInput.h"
 #include "CStep.h"
 
diff --git a/bulls-and-cows-cpp/CStep.h b/bulls-and-cows-cpp/CStep.h
index 9d7308b..6ccdd57 100644
--- a/bulls-and-cows-cpp/CStep.h
+++ b/bulls-and-cows-cpp/CStep.h
@@ -1,7 +1,7 @@
 // CStep.h
 //
 #pragma once
-#include <vector>
+#include "headers.h"
 
 class CStep
 {
diff --git a/bulls-and-cows-cpp/CUserInput.h b/bulls-and-cows-cpp/CUserInput.h
index 8b7ead0..1e289bd 100644
--- a/bulls-and-cows-cpp/CUserInput.h
+++ b/bulls-and-cows-cpp/CUserInput.h
@@ -1,11 +1,7 @@
 // CUserInput.h
 //
 #pragma once
-#include "defines.h"
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cwctype>
+#include "headers.h"
 
 class CUserInput
 {
diff --git a/bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj b/bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj
index 37e2534..8eac939 100644
--- a/bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj
+++ b/bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj
@@ -142,6 +142,7 @@
     <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">
diff --git a/bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj.filters b/bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj.filters
index a16d925..b750d60 100644
--- a/bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj.filters
+++ b/bulls-and-cows-cpp/bulls-and-cows-cpp.vcxproj.filters
@@ -47,5 +47,8 @@
     <ClInclude Include="defines.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="headers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/bulls-and-cows-cpp/bulls-and-cows.cpp b/bulls-and-cows-cpp/bulls-and-cows.cpp
index 0d9f095..9dd264b 100644
--- a/bulls-and-cows-cpp/bulls-and-cows.cpp
+++ b/bulls-and-cows-cpp/bulls-and-cows.cpp
@@ -1,6 +1,6 @@
 // bulls-and-cows.cpp
 //
-#include <Windows.h>
+#include "headers.h"
 #include "..\..\..\MyFunctions\SetUserLocale.h"
 #include "CGame.h"
 
diff --git a/bulls-and-cows-cpp/defines.h b/bulls-and-cows-cpp/defines.h
index a85a2da..f165750 100644
--- a/bulls-and-cows-cpp/defines.h
+++ b/bulls-and-cows-cpp/defines.h
@@ -1,3 +1,5 @@
+// defines.h
+//
 #pragma once
 
 #define VERSION 0.3
diff --git a/bulls-and-cows-cpp/headers.h b/bulls-and-cows-cpp/headers.h
new file mode 100644
index 0000000..2f5ee72
--- /dev/null
+++ b/bulls-and-cows-cpp/headers.h
@@ -0,0 +1,11 @@
+// headers.h
+//
+#pragma once
+#include <Windows.h>
+#include <iostream>
+#include <random>
+#include <string>
+#include <vector>
+#include <cwctype>
+
+#include "defines.h"