diff --git a/bulls-and-cows-cpp/CGame.cpp b/bulls-and-cows-cpp/CGame.cpp index 7c2af8f..a617a80 100644 --- a/bulls-and-cows-cpp/CGame.cpp +++ b/bulls-and-cows-cpp/CGame.cpp @@ -10,9 +10,9 @@ void CGame::Init() { - m_ucBulls = 0; - m_ucCows = 0; - m_uStepCounter = 0; + m_nBulls = 0; + m_nCows = 0; + m_nStepCounter = 0; m_fGameIsEnd = false; m_sLastError = L""; @@ -20,21 +20,21 @@ void CGame::Init() std::default_random_engine e(r()); std::uniform_int_distribution 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; } } @@ -53,7 +53,7 @@ void CGame::Start() CPrint::Steps(this); } while (!GetNumber(step)); - m_uStepCounter++; + m_nStepCounter++; } CPrint::GameHeader(); @@ -67,7 +67,7 @@ bool CGame::GetNumber(CStep step) std::wcout << L"\t\t\t\t\t" << m_sLastError << L"\r"; std::wcout << "=>\t"; - CUserInput userInput(m_ucDigits); + CUserInput userInput(m_nDigits); if (userInput.Get()) { @@ -82,15 +82,15 @@ bool CGame::GetNumber(CStep step) } else { - m_sLastError = strERROR_2_1 + std::to_wstring(m_ucDigits) + strERROR_2_2; + 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; @@ -112,7 +112,7 @@ CGame::CGame() { 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 @@ -125,5 +125,5 @@ CGame::CGame() CGame::~CGame() { - delete[] m_uGuessedNumber; + delete[] m_nGuessedNumber; } diff --git a/bulls-and-cows-cpp/CGame.h b/bulls-and-cows-cpp/CGame.h index 4c35107..aa32668 100644 --- a/bulls-and-cows-cpp/CGame.h +++ b/bulls-and-cows-cpp/CGame.h @@ -8,8 +8,8 @@ class CGame { private: - int m_ucBulls; - int m_ucCows; + int m_nBulls; + int m_nCows; bool m_fGameIsEnd; std::wstring m_sLastError; @@ -19,10 +19,10 @@ private: 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 m_Steps; + int m_nDigits; // Number of digits into the guessed number + int m_nStepCounter; + int* m_nGuessedNumber; + std::vector m_vSteps; void Init(); void Start(); diff --git a/bulls-and-cows-cpp/CPrint.cpp b/bulls-and-cows-cpp/CPrint.cpp index aa4f840..22bbe5b 100644 --- a/bulls-and-cows-cpp/CPrint.cpp +++ b/bulls-and-cows-cpp/CPrint.cpp @@ -21,14 +21,14 @@ void CPrint::GameHeader() 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; + std::wcout << strNUM_STEPS << game->m_nStepCounter << "\n\n" << std::endl; } void CPrint::Steps(CGame* const game) { - if (game->m_Steps.size() < 1) return; + if (game->m_vSteps.size() < 1) return; - for (CStep& s : game->m_Steps) + for (CStep& s : game->m_vSteps) { std::wcout << '\t'; for (int& d : s.GetStepNumber()) std::wcout << d; @@ -40,13 +40,13 @@ void CPrint::Steps(CGame* const game) void CPrint::GuessedNumber(CGame* const game, const bool show) { std::wcout << '\t'; - for (int i = 0; i < game->m_ucDigits; ++i) + for (int i = 0; i < game->m_nDigits; ++i) { - show ? std::wcout << game->m_uGuessedNumber[i] : std::wcout << '#'; + show ? std::wcout << game->m_nGuessedNumber[i] : std::wcout << '#'; } std::wcout << '\n' << '\t'; - for (int i = 0; i < game->m_ucDigits; ++i) + for (int i = 0; i < game->m_nDigits; ++i) { std::wcout << '-'; } diff --git a/bulls-and-cows-cpp/CStep.cpp b/bulls-and-cows-cpp/CStep.cpp index b26d767..e4e1b29 100644 --- a/bulls-and-cows-cpp/CStep.cpp +++ b/bulls-and-cows-cpp/CStep.cpp @@ -5,38 +5,38 @@ void CStep::StoreStepNumber(std::vector& 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 CStep::GetStepNumber() { - return m_uStepNumber; + return m_nStepNumber; } std::pair CStep::GetStepAnimals() { - return m_uStepAnimals; + return m_nStepAnimals; } diff --git a/bulls-and-cows-cpp/CStep.h b/bulls-and-cows-cpp/CStep.h index d8f72f9..623f7fb 100644 --- a/bulls-and-cows-cpp/CStep.h +++ b/bulls-and-cows-cpp/CStep.h @@ -7,8 +7,8 @@ class CStep { private: - std::vector m_uStepNumber; - std::pair m_uStepAnimals; + std::vector m_nStepNumber; + std::pair m_nStepAnimals; public: void StoreStepNumber(std::vector&); diff --git a/bulls-and-cows-cpp/CUserInput.cpp b/bulls-and-cows-cpp/CUserInput.cpp index 39808b6..f58def4 100644 --- a/bulls-and-cows-cpp/CUserInput.cpp +++ b/bulls-and-cows-cpp/CUserInput.cpp @@ -6,9 +6,9 @@ #include #include -CUserInput::CUserInput(int nNumOfDigits) +CUserInput::CUserInput(int numOfDigits) { - m_nNumOfExpectedDigits = nNumOfDigits; + m_nNumOfExpectedDigits = numOfDigits; } bool CUserInput::Get() diff --git a/bulls-and-cows-cpp/CUserInput.h b/bulls-and-cows-cpp/CUserInput.h index ff1e6d7..5f8a612 100644 --- a/bulls-and-cows-cpp/CUserInput.h +++ b/bulls-and-cows-cpp/CUserInput.h @@ -10,6 +10,6 @@ public: int m_nNumOfExpectedDigits; std::vector m_vUserInput; - CUserInput(int nNumOfExpectedDigits); + CUserInput(int); bool Get(); };