perf: change shared_ptrs from copy to reference

.gitignore

@@ -397,3 +397,4 @@ vcpkg_installed
 
 # CLION
 cmake-build-*
+canary-debug

cmake/modules/CheckSIMDSupport.cmake

@@ -0,0 +1,70 @@
+include(CheckCXXCompilerFlag)
+
+if(MSVC)
+    check_cxx_compiler_flag("/arch:AVX2" COMPILER_SUPPORTS_AVX2)
+    if(COMPILER_SUPPORTS_AVX2)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
+        add_definitions(-D__AVX2__ -D__SSE4_2__ -D__SSE4_1__ -D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("AVX2: Advanced Vector Extensions 2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_AVX)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX")
+        add_definitions(-D__AVX__ -D__SSE4_2__ -D__SSE4_1__ -D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("AVX: Advanced Vector Extensions supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE42)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE4.2")
+        add_definitions(-D__SSE4_2__ -D__SSE4_1__ -D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("SSE4.2: Streaming SIMD Extensions 4.2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE41)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE4.1")
+        add_definitions(-D__SSE4_1__ -D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("SSE4.1: Streaming SIMD Extensions 4.1 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE3)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE3")
+        add_definitions(-D__SSE3__ -D__SSE2__ -D__SSE__)
+        log_option_enabled("SSE3: Streaming SIMD Extensions 3 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE2)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+        add_definitions(-D__SSE2__ -D__SSE__)
+        log_option_enabled("SSE2: Streaming SIMD Extensions 2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE")
+        add_definitions(-D__SSE__)
+        log_option_enabled("SSE: Streaming SIMD Extensions supported and enabled.")
+    else()
+        message(STATUS "No advanced SIMD support found. Proceeding with the default instruction set.")
+    endif()
+else()
+    include(CheckCXXCompilerFlag)
+    check_cxx_compiler_flag("-mavx2" COMPILER_SUPPORTS_AVX2)
+    if(COMPILER_SUPPORTS_AVX2)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2")
+        add_definitions(-D__AVX2__)
+        log_option_enabled("AVX2: Advanced Vector Extensions 2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_AVX)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
+        add_definitions(-D__AVX__)
+        log_option_enabled("AVX: Advanced Vector Extensions supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE42)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
+        add_definitions(-D__SSE4_2__)
+        log_option_enabled("SSE4.2: Streaming SIMD Extensions 4.2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE41)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
+        add_definitions(-D__SSE4_1__)
+        log_option_enabled("SSE4.1: Streaming SIMD Extensions 4.1 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE3)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse3")
+        add_definitions(-D__SSE3__)
+        log_option_enabled("SSE3: Streaming SIMD Extensions 3 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE2)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
+        add_definitions(-D__SSE2__)
+        log_option_enabled("SSE2: Streaming SIMD Extensions 2 supported and enabled.")
+    elseif(COMPILER_SUPPORTS_SSE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
+        add_definitions(-D__SSE__)
+        log_option_enabled("SSE: Streaming SIMD Extensions supported and enabled.")
+    else()
+        message(STATUS "No advanced SIMD support found. Proceeding with the default instruction set.")
+    endif()
+endif()

data-otservbr-global/scripts/creaturescripts/monster/gaz_haragoth_heal.lua

@@ -5,22 +5,36 @@ condition:setParameter(CONDITION_PARAM_HEALTHGAIN, 0.01)
 condition:setParameter(CONDITION_PARAM_HEALTHTICKS, 7 * 1000)
 
 local gazHaragothHeal = CreatureEvent("GazHaragothHeal")
-function gazHaragothHeal.onThink(creature)
-	local hp = (creature:getHealth() / creature:getMaxHealth()) * 100
-	if hp < 12.5 and not creature:getCondition(CONDITION_REGENERATION, CONDITIONID_DEFAULT, 88888) then
-		creature:addCondition(condition)
-		creature:say("Gaz'haragoth begins to draw on the nightmares to HEAL himself!", TALKTYPE_MONSTER_YELL)
-		addEvent(function(cid)
-			local creature = Creature(cid)
-			if not creature then
-				return
+function gazHaragothHeal.onHealthChange(creature, attacker, primaryDamage, primaryType, secondaryDamage, secondaryType, origin)
+	if not creature then
+		return true
+	end
+	local creatureName = creature:getName():lower() == "gaz'haragoth"
+	if creatureName then
+		if attacker then
+			local hp = (creature:getHealth() / creature:getMaxHealth()) * 100
+			if hp > 12.5 then
+				return primaryDamage, primaryType, secondaryDamage, secondaryType
+			end
+			if hp <= 12.5 and not creature:getCondition(CONDITION_REGENERATION, CONDITIONID_DEFAULT, 88888) then
+				if not creature then
+					return true
+				end
+				creature:addCondition(condition)
+				creature:say("Gaz'haragoth begins to draw on the nightmares to HEAL himself!", TALKTYPE_MONSTER_YELL)
+				addEvent(function()
+					if not creature then
+						return true
+					end
+					creature:addHealth(300000)
+					creature:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+					creature:say("Gaz'haragoth HEALS himself!", TALKTYPE_MONSTER_YELL)
+					return true
+				end, 7000, creature:getId())
 			end
-			creature:addHealth(300000)
-			creature:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
-			creature:say("Gaz'haragoth HEALS himself!", TALKTYPE_MONSTER_YELL)
-			return true
-		end, 7000, creature:getId())
+		end
 	end
+	return primaryDamage, primaryType, secondaryDamage, secondaryType
 end
 
 gazHaragothHeal:register()

src/CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
 
 # Base configurations and settings for the project
 include(BaseConfig)
+include(CheckSIMDSupport)
 include(GNUInstallDirs)
 
 # Import configurations, source definitions, and linker settings

src/account/account.cpp

@@ -62,85 +62,88 @@
 	return load();
 }
 
-uint8_t Account::save() {
+uint8_t Account::save() const {
+	using enum AccountErrors_t;
+
 	if (!m_accLoaded) {
-		return enumToValue(AccountErrors_t::NotInitialized);
+		return enumToValue(NotInitialized);
 	}
-
 	if (!g_accountRepository().save(m_account)) {
-		return enumToValue(AccountErrors_t::Storage);
+		return enumToValue(Storage);
 	}
-
-	return enumToValue(AccountErrors_t::Ok);
+	return enumToValue(Ok);
 }
 
-std::tuple<uint32_t, uint8_t> Account::getCoins(const uint8_t &type) const {
+std::tuple<uint32_t, AccountErrors_t> Account::getCoins(CoinType type) const {
+	using enum AccountErrors_t;
 	if (!m_accLoaded) {
-		return { 0, enumToValue(AccountErrors_t::NotInitialized) };
+		return { 0, NotInitialized };
 	}
 
 	uint32_t coins = 0;
 	if (!g_accountRepository().getCoins(m_account->id, type, coins)) {
 		return { 0, enumToValue(AccountErrors_t::Storage) };
 	}
 
-	return { coins, enumToValue(AccountErrors_t::Ok) };
+	return { coins, Ok };
 }
 
-uint8_t Account::addCoins(const uint8_t &type, const uint32_t &amount, const std::string &detail) {
+AccountErrors_t Account::addCoins(CoinType type, const uint32_t &amount, const std::string &detail) {
+	using enum AccountErrors_t;
 	if (!m_accLoaded) {
-		return enumToValue(AccountErrors_t::NotInitialized);
+		return NotInitialized;
 	}
 
 	if (amount == 0) {
-		return enumToValue(AccountErrors_t::Ok);
+		return Ok;
 	}
 
 	auto [coins, result] = getCoins(type);
 
-	if (AccountErrors_t::Ok != enumFromValue<AccountErrors_t>(result)) {
+	if (Ok != result) {
 		return result;
 	}
 
 	if (!g_accountRepository().setCoins(m_account->id, type, coins + amount)) {
 		return enumToValue(AccountErrors_t::Storage);
 	}
 
-	registerCoinTransaction(enumToValue(CoinTransactionType::Add), type, amount, detail);
+	registerCoinTransaction(CoinTransactionType::Add, type, amount, detail);
 
-	return enumToValue(AccountErrors_t::Ok);
+	return Ok;
 }
 
-uint8_t Account::removeCoins(const uint8_t &type, const uint32_t &amount, const std::string &detail) {
+AccountErrors_t Account::removeCoins(CoinType type, const uint32_t &amount, const std::string &detail) {
+	using enum AccountErrors_t;
 	if (!m_accLoaded) {
-		return enumToValue(AccountErrors_t::NotInitialized);
+		return NotInitialized;
 	}
 
 	if (amount == 0) {
-		return enumToValue(AccountErrors_t::Ok);
+		return AccountErrors_t::Ok;
 	}
 
 	auto [coins, result] = getCoins(type);
 
-	if (AccountErrors_t::Ok != enumFromValue<AccountErrors_t>(result)) {
+	if (Ok != result) {
 		return result;
 	}
 
 	if (coins < amount) {
 		g_logger().info("Account doesn't have enough coins! current[{}], remove:[{}]", coins, amount);
-		return enumToValue(AccountErrors_t::RemoveCoins);
+		return RemoveCoins;
 	}
 
 	if (!g_accountRepository().setCoins(m_account->id, type, coins - amount)) {
 		return enumToValue(AccountErrors_t::Storage);
 	}
 
-	registerCoinTransaction(enumToValue(CoinTransactionType::Remove), type, amount, detail);
+	registerCoinTransaction(CoinTransactionType::Remove, type, amount, detail);
 
-	return enumToValue(AccountErrors_t::Ok);
+	return Ok;
 }
 
-void Account::registerCoinTransaction(const uint8_t &transactionType, const uint8_t &type, const uint32_t &amount, const std::string &detail) {
+void Account::registerCoinTransaction(CoinTransactionType transactionType, CoinType type, const uint32_t &amount, const std::string &detail) {
 	if (!m_accLoaded) {
 		return;
 	}
@@ -221,10 +224,10 @@
 	time_t lastDay = m_account->premiumLastDay;
 	uint32_t remainingDays = m_account->premiumRemainingDays;
 
-	time_t currentTime = getTimeNow();
+	const time_t currentTime = getTimeNow();
 
-	auto daysLeft = static_cast<int32_t>((lastDay - currentTime) / 86400);
-	auto timeLeft = static_cast<int32_t>((lastDay - currentTime) % 86400);
+	const auto daysLeft = static_cast<int32_t>((lastDay - currentTime) / 86400);
+	const auto timeLeft = static_cast<int32_t>((lastDay - currentTime) % 86400);
 
 	m_account->premiumRemainingDays = daysLeft > 0 ? daysLeft : 0;
 
@@ -276,7 +279,7 @@
 }
 
 bool Account::authenticatePassword(const std::string &password) {
-	if (Argon2 {}.argon(password.c_str(), getPassword())) {
+	if (Argon2().argon(password, getPassword())) {
 		return true;
 	}
 

src/account/account.hpp

@@ -11,6 +11,10 @@
 
 struct AccountInfo;
 
+enum class CoinType : uint8_t;
+enum class CoinTransactionType : uint8_t;
+enum class AccountErrors_t : uint8_t;
+
 class Account {
 public:
 	explicit Account(const uint32_t &id);
@@ -26,7 +30,7 @@ class Account {
 	 * @return uint32_t Number of coins
 	 * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail.
 	 */
-	[[nodiscard]] std::tuple<uint32_t, uint8_t> getCoins(const uint8_t &type) const;
+	[[nodiscard]] std::tuple<uint32_t, AccountErrors_t> getCoins(CoinType type) const;
 
 	/**
 	 * @brief Add coins to the account.
@@ -35,7 +39,7 @@ class Account {
 	 * @param amount Amount of coins to be added
 	 * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail.
 	 */
-	uint8_t addCoins(const uint8_t &type, const uint32_t &amount, const std::string &detail = "ADD Coins");
+	AccountErrors_t addCoins(CoinType type, const uint32_t &amount, const std::string &detail = "ADD Coins");
 
 	/**
 	 * @brief Removes coins from the account.
@@ -44,7 +48,7 @@ class Account {
 	 * @param amount Amount of coins to be removed
 	 * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail.
 	 */
-	uint8_t removeCoins(const uint8_t &type, const uint32_t &amount, const std::string &detail = "REMOVE Coins");
+	AccountErrors_t removeCoins(CoinType type, const uint32_t &amount, const std::string &detail = "REMOVE Coins");
 
 	/**
 	 * @brief Registers a coin transaction.
@@ -53,7 +57,7 @@ class Account {
 	 * @param amount Amount of coins to be added
 	 * @param detail Detail of the transaction
 	 */
-	void registerCoinTransaction(const uint8_t &transactionType, const uint8_t &type, const uint32_t &amount, const std::string &detail);
+	void registerCoinTransaction(CoinTransactionType transactionType, CoinType type, const uint32_t &amount, const std::string &detail);
 
 	/***************************************************************************
 	 * Account Load/Save
@@ -64,7 +68,7 @@ class Account {
 	 *
 	 * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail.
 	 */
-	uint8_t save();
+	uint8_t save() const;
 
 	/**
 	 * @brief Load Account Information.

src/account/account_repository.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "account/account_repository.hpp"
-
 #include "lib/di/container.hpp"
 
 AccountRepository &AccountRepository::getInstance() {

src/account/account_repository.hpp

@@ -11,6 +11,9 @@
 
 struct AccountInfo;
 
+enum class CoinType : uint8_t;
+enum class CoinTransactionType : uint8_t;
+
 class AccountRepository {
 public:
 	AccountRepository() = default;
@@ -31,13 +34,13 @@ class AccountRepository {
 
 	virtual bool getPassword(const uint32_t &id, std::string &password) = 0;
 
-	virtual bool getCoins(const uint32_t &id, const uint8_t &type, uint32_t &coins) = 0;
-	virtual bool setCoins(const uint32_t &id, const uint8_t &type, const uint32_t &amount) = 0;
+	virtual bool getCoins(const uint32_t &id, CoinType coinType, uint32_t &coins) = 0;
+	virtual bool setCoins(const uint32_t &id, CoinType coinType, const uint32_t &amount) = 0;
 	virtual bool registerCoinsTransaction(
 		const uint32_t &id,
-		uint8_t type,
+		CoinTransactionType type,
 		uint32_t coins,
-		const uint8_t &coinType,
+		CoinType coinType,
 		const std::string &description
 	) = 0;
 };