fix: compilation and indentation

opentibiabr · Oct 15, 2024 · be30946 · be30946
1 parent 6172f7e
commit be30946
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/database/database.cpp b/src/database/database.cpp
@@ -741,7 +741,7 @@ std::string DBResult::getString(const std::string &columnName) const {
 	if (columnData.isNull()) {
 		g_logger().debug("[DBResult::getString] query: {}", m_query);
 		g_logger().debug("Column '{}' is null", columnName);
-		return nullptr;
+		return {};
 	}
 
 	g_logger().trace("[DBResult::getString] query: {}", m_query);

diff --git a/src/io/functions/iologindata_load_player.cpp b/src/io/functions/iologindata_load_player.cpp
@@ -212,7 +212,7 @@ void IOLoginDataLoad::loadPlayerBlessings(std::shared_ptr<Player> player, DBResu
 		return;
 	}
 
-	for (const auto& bless : magic_enum::enum_values<Blessings>()) {
+	for (const auto &bless : magic_enum::enum_values<Blessings>()) {
 		uint8_t blessId = static_cast<uint8_t>(bless);
 		std::string columName = fmt::format("blessings{}", blessId);
 		g_logger().trace("[{}] - Player {}, loading blessing: {}, id: {}", __FUNCTION__, player->getName(), columName, blessId);

diff --git a/src/io/functions/iologindata_save_player.cpp b/src/io/functions/iologindata_save_player.cpp
@@ -335,7 +335,7 @@ bool IOLoginDataSave::savePlayerFirst(std::shared_ptr<Player> player) {
 	}
 
 	// Blessings
-	for (const auto& bless : magic_enum::enum_values<Blessings>()) {
+	for (const auto &bless : magic_enum::enum_values<Blessings>()) {
 		uint8_t blessId = static_cast<uint8_t>(bless);
 		values.push_back(mysqlx::Value(player->getBlessingCount(blessId)));
 	}

diff --git a/src/main.cpp b/src/main.cpp
@@ -9,26 +9,27 @@
 
 #include "canary_server.hpp"
 #include "lib/di/container.hpp"
-// Define um conceito para garantir que a função só aceite contêineres de números
+
+// Defines a concept to ensure the function only accepts containers of numbers
 template <typename T>
 concept NumberContainer = requires(T a) {
 	typename T::value_type;
 	requires std::integral<typename T::value_type> || std::floating_point<typename T::value_type>;
 };
 
-// Função que calcula a média de um contêiner de números
+// Function that calculates the average of a container of numbers
 auto calculateAverage(const NumberContainer auto &container) {
-	// Utiliza ranges e std::views para processar o contêiner
+	// Uses ranges and std::views to process the container
 	return std::accumulate(container.begin(), container.end(), 0.0) / std::ranges::distance(container);
 }
 
 int main() {
 	std::vector<int> numbers = { 1, 2, 3, 4, 5 };
 
-	// Calcula a média usando a função com suporte a C++23
+	// Calculates the average using the function with support for C++23
 	double average = calculateAverage(numbers);
 
-	std::cout << "Average: " << average << std::endl;
+	g_logger().trace("Average: {}", average);
 
 	return inject<CanaryServer>().run();
 }
diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -4346,7 +4346,7 @@ void ProtocolGame::sendBlessStatus() {
 	uint8_t blessCount = 0;
 	uint16_t flag = 0;
 	uint16_t pow2 = 2;
-	for (const auto& bless : magic_enum::enum_values<Blessings>()) {
+	for (const auto &bless : magic_enum::enum_values<Blessings>()) {
 		uint8_t blessId = static_cast<uint8_t>(bless);
 		if (player->hasBlessing(blessId)) {
 			if (blessId > 1) {