From 5a4fa61ed209122bfd4357f1245117c5b3836670 Mon Sep 17 00:00:00 2001 From: W0LF Date: Fri, 4 Aug 2023 14:19:23 +0300 Subject: [PATCH] Version 0.4 --- bulls-and-cows-cpp/CGame.cpp | 13 +++++++------ bulls-and-cows-cpp/CGame.h | 1 + bulls-and-cows-cpp/CStep.cpp | 1 + bulls-and-cows-cpp/CStep.h | 1 + bulls-and-cows-cpp/CUserInput.cpp | 1 + bulls-and-cows-cpp/CUserInput.h | 1 + bulls-and-cows-cpp/bulls-and-cows.cpp | 1 + bulls-and-cows-cpp/defines.h | 7 ++----- bulls-and-cows-cpp/headers.h | 1 + 9 files changed, 16 insertions(+), 11 deletions(-) diff --git a/bulls-and-cows-cpp/CGame.cpp b/bulls-and-cows-cpp/CGame.cpp index a4820ac..03fc45b 100644 --- a/bulls-and-cows-cpp/CGame.cpp +++ b/bulls-and-cows-cpp/CGame.cpp @@ -1,4 +1,5 @@ -// CGame.cpp +// Bulls and Cows the game +// CGame.cpp // #include "CGame.h" @@ -108,8 +109,8 @@ void CGame::ShowGuessedNumber(bool show) void CGame::PrintGameHeader() { std::system("cls"); - std::wcout << strGAMENAME << ' ' << strGAMEVERSION << ' ' << VERSION << std::endl; - std::wcout << strGAMECOPYRIGHT << "\n\n\n" << std::endl; + std::wcout << L"Быки и Коровы." << ' ' << L"Версия" << ' ' << VERSION << std::endl; + std::wcout << L"Copyright (c) 2023 by W0LF aka 'dreamforce'" << "\n\n" << std::endl; } void CGame::PrintGameFooter() @@ -142,13 +143,13 @@ CGame::CGame() do { PrintGameHeader(); - std::wcout << L"Введите количество цифр в числе (от 3 до 7).\n"; - std::wcout << L"Чем больше цифр - тем сложнее. Обычно 4.\n"; + std::wcout << L"Введите количество цифр в числе (от 3 до 5).\n"; + std::wcout << L"Чем больше цифр - тем сложнее. Обычно 4.\n\n"; std::wcout << L"=> "; if (userInput.Get()) { - if ((userInput.m_vUserInput.at(0) >= 3) && (userInput.m_vUserInput.at(0) <= 7)) + if ((userInput.m_vUserInput.at(0) >= 3) && (userInput.m_vUserInput.at(0) <= 5)) { m_ucDigits = userInput.m_vUserInput.at(0); ok = true; diff --git a/bulls-and-cows-cpp/CGame.h b/bulls-and-cows-cpp/CGame.h index 59ce92d..36405a1 100644 --- a/bulls-and-cows-cpp/CGame.h +++ b/bulls-and-cows-cpp/CGame.h @@ -1,3 +1,4 @@ +// Bulls and Cows the game // CGame.h // #pragma once diff --git a/bulls-and-cows-cpp/CStep.cpp b/bulls-and-cows-cpp/CStep.cpp index 85cec22..b26d767 100644 --- a/bulls-and-cows-cpp/CStep.cpp +++ b/bulls-and-cows-cpp/CStep.cpp @@ -1,3 +1,4 @@ +// Bulls and Cows the game // CStep.cpp // #include "CStep.h" diff --git a/bulls-and-cows-cpp/CStep.h b/bulls-and-cows-cpp/CStep.h index 6ccdd57..07f2659 100644 --- a/bulls-and-cows-cpp/CStep.h +++ b/bulls-and-cows-cpp/CStep.h @@ -1,3 +1,4 @@ +// Bulls and Cows the game // CStep.h // #pragma once diff --git a/bulls-and-cows-cpp/CUserInput.cpp b/bulls-and-cows-cpp/CUserInput.cpp index 7da6378..cd72899 100644 --- a/bulls-and-cows-cpp/CUserInput.cpp +++ b/bulls-and-cows-cpp/CUserInput.cpp @@ -1,3 +1,4 @@ +// Bulls and Cows the game // CUserInput.cpp // #include "CUserInput.h" diff --git a/bulls-and-cows-cpp/CUserInput.h b/bulls-and-cows-cpp/CUserInput.h index 1e289bd..b76d810 100644 --- a/bulls-and-cows-cpp/CUserInput.h +++ b/bulls-and-cows-cpp/CUserInput.h @@ -1,3 +1,4 @@ +// Bulls and Cows the game // CUserInput.h // #pragma once diff --git a/bulls-and-cows-cpp/bulls-and-cows.cpp b/bulls-and-cows-cpp/bulls-and-cows.cpp index 9dd264b..87d9e63 100644 --- a/bulls-and-cows-cpp/bulls-and-cows.cpp +++ b/bulls-and-cows-cpp/bulls-and-cows.cpp @@ -1,3 +1,4 @@ +// Bulls and Cows the game // bulls-and-cows.cpp // #include "headers.h" diff --git a/bulls-and-cows-cpp/defines.h b/bulls-and-cows-cpp/defines.h index 658152a..c975b33 100644 --- a/bulls-and-cows-cpp/defines.h +++ b/bulls-and-cows-cpp/defines.h @@ -1,11 +1,8 @@ +// Bulls and Cows the game // defines.h // #pragma once - -#define VERSION 0.3 -#define strGAMENAME L" ." -#define strGAMEVERSION L"" -#define strGAMECOPYRIGHT L"Copyright (c) 2023 by W0LF aka 'dreamforce'" +#define VERSION 0.4 #ifdef _DEBUG #define IS_SHOW true diff --git a/bulls-and-cows-cpp/headers.h b/bulls-and-cows-cpp/headers.h index 2f5ee72..887c870 100644 --- a/bulls-and-cows-cpp/headers.h +++ b/bulls-and-cows-cpp/headers.h @@ -1,3 +1,4 @@ +// Bulls and Cows the game // headers.h // #pragma once