fixes

Author: rei-2

Amalgam/Amalgam.vcxproj

@@ -1078,7 +1078,7 @@
     <ClCompile Include="src\SDK\Helpers\TraceFilters\TraceFilters.cpp" />
     <ClCompile Include="src\SDK\SDK.cpp" />
     <ClCompile Include="src\SDK\Helpers\ConVars\ConVars.cpp" />
-    <ClCompile Include="src\Utils\ErrorLog\ErrorLog.cpp" />
+    <ClCompile Include="src\Utils\ExceptionHandler\ExceptionHandler.cpp" />
     <ClCompile Include="src\Utils\Hooks\Hooks.cpp" />
     <ClCompile Include="src\Utils\Interfaces\Interfaces.cpp" />
     <ClCompile Include="src\Utils\KeyHandler\KeyHandler.cpp" />
@@ -1458,7 +1458,7 @@
     <ClInclude Include="src\SDK\SDK.h" />
     <ClInclude Include="src\SDK\Vars.h" />
     <ClInclude Include="src\SDK\Helpers\ConVars\ConVars.h" />
-    <ClInclude Include="src\Utils\ErrorLog\ErrorLog.h" />
+    <ClInclude Include="src\Utils\ExceptionHandler\ExceptionHandler.h" />
     <ClInclude Include="src\Utils\Macros\Macros.h" />
     <ClInclude Include="src\Utils\Hash\FNV1A.h" />
     <ClInclude Include="src\Utils\Hooks\Hooks.h" />

Amalgam/Amalgam.vcxproj.filters

@@ -82,7 +82,7 @@
     <ClCompile Include="src\SDK\Definitions\Misc\ChecksumCRC.cpp" />
     <ClCompile Include="src\Hooks\Direct3DDevice9.cpp" />
     <ClCompile Include="src\SDK\Events\Events.cpp" />
-    <ClCompile Include="src\Utils\ErrorLog\ErrorLog.cpp" />
+    <ClCompile Include="src\Utils\ExceptionHandler\ExceptionHandler.cpp" />
     <ClCompile Include="src\BytePatches\BytePatches.cpp" />
     <ClCompile Include="include\ImGui\imgui_freetype.cpp" />
     <ClCompile Include="src\Features\Misc\AutoVote\AutoVote.cpp" />
@@ -458,7 +458,7 @@
     <ClInclude Include="src\SDK\Definitions\Main\CCaptureFlag.h" />
     <ClInclude Include="src\SDK\Definitions\Interfaces\IPanel.h" />
     <ClInclude Include="src\SDK\Definitions\Interfaces\CTFGCClientSystem.h" />
-    <ClInclude Include="src\Utils\ErrorLog\ErrorLog.h" />
+    <ClInclude Include="src\Utils\ExceptionHandler\ExceptionHandler.h" />
     <ClInclude Include="src\BytePatches\BytePatches.h" />
     <ClInclude Include="include\freetype\config\ftconfig.h" />
     <ClInclude Include="include\freetype\config\ftheader.h" />

Amalgam/src/DllMain.cpp

@@ -1,16 +1,16 @@
 #include <Windows.h>
 #include "Core/Core.h"
-#include "Utils/ErrorLog/ErrorLog.h"
+#include "Utils/ExceptionHandler/ExceptionHandler.h"
 
 DWORD WINAPI MainThread(LPVOID lpParam)
 {
-	U::ErrorLog.Initialize(lpParam);
+	U::ExceptionHandler.Initialize(lpParam);
 
 	U::Core.Load();
 	U::Core.Loop();
 	U::Core.Unload();
 
-	U::ErrorLog.Unload();
+	U::ExceptionHandler.Unload();
 
 	FreeLibraryAndExitThread(static_cast<HMODULE>(lpParam), EXIT_SUCCESS);
 }

Amalgam/src/Features/Binds/Binds.cpp

@@ -125,8 +125,8 @@ static inline void GetBinds(int iParent, CTFPlayer* pLocal, CTFWeaponBase* pWeap
 
 		if (tBind.m_bActive)
 		{
-			LoopVars(i, tBind.m_vVars);
 			GetBinds(i, pLocal, pWeapon, vBinds, bManage);
+			LoopVars(i, tBind.m_vVars);
 		}
 	}
 }

Amalgam/src/Features/ImGui/Menu/Components.h

@@ -361,7 +361,7 @@ namespace ImGui
 		return sText;
 	}
 
-	inline std::string TruncateText(std::string sText, int iPixels, ImFont* pFont = nullptr, std::string sEnd = "...", size_t* pLength = nullptr)
+	inline std::string TruncateText(const std::string& sText, int iPixels, ImFont* pFont = nullptr, const char* sEnd = "...", size_t* pLength = nullptr)
 	{
 		if (sText.empty())
 			return "";
@@ -387,7 +387,7 @@ namespace ImGui
 		return sTruncated;
 	}
 
-	inline std::deque<std::string> WrapText(std::string sText, int iPixels, ImFont* pFont = nullptr)
+	inline std::deque<std::string> WrapText(const std::string& sText, int iPixels, ImFont* pFont = nullptr)
 	{
 		if (sText.empty())
 			return { "" };

Amalgam/src/Features/Visuals/Visuals.cpp

@@ -76,9 +76,10 @@ void CVisuals::ProjectileTrace(CTFPlayer* pPlayer, CTFWeaponBase* pWeapon, const
 	filter.pSkip = pPlayer;
 	int nMask = MASK_SOLID;
 	F::ProjSim.SetupTrace(filter, nMask, pWeapon, 0, bQuick);
-
 	Vec3* pNormal = nullptr;
-	for (int n = 1; n <= TIME_TO_TICKS(tProjInfo.m_flLifetime); n++)
+
+	int iTicks = TIME_TO_TICKS(std::min(tProjInfo.m_flLifetime, 10.f));
+	for (int n = 1; n <= iTicks; n++)
 	{
 		Vec3 Old = F::ProjSim.GetOrigin();
 		F::ProjSim.RunTick(tProjInfo);

Amalgam/src/Utils/ErrorLog/ErrorLog.cpp …ls/ExceptionHandler/ExceptionHandler.cppAmalgam/src/Utils/ErrorLog/ErrorLog.cpp renamed to Amalgam/src/Utils/ExceptionHandler/ExceptionHandler.cpp Amalgam/src/Utils/ErrorLog/ErrorLog.cpp renamed to Amalgam/src/Utils/ExceptionHandler/ExceptionHandler.cpp

@@ -1,4 +1,4 @@
-#include "ErrorLog.h"
+#include "ExceptionHandler.h"
 
 #include "../../Features/Configs/Configs.h"
 
@@ -183,12 +183,12 @@ static LONG APIENTRY ExceptionFilter(PEXCEPTION_POINTERS ExceptionInfo)
 	return EXCEPTION_EXECUTE_HANDLER;
 }
 
-void CErrorLog::Initialize(LPVOID lpParam)
+void CExceptionHandler::Initialize(LPVOID lpParam)
 {
 	s_pHandle = AddVectoredExceptionHandler(1, ExceptionFilter);
 	s_lpParam = lpParam;
 }
-void CErrorLog::Unload()
+void CExceptionHandler::Unload()
 {
 	RemoveVectoredExceptionHandler(s_pHandle);
 }

Amalgam/src/Utils/ErrorLog/ErrorLog.h …tils/ExceptionHandler/ExceptionHandler.hAmalgam/src/Utils/ErrorLog/ErrorLog.h renamed to Amalgam/src/Utils/ExceptionHandler/ExceptionHandler.h Amalgam/src/Utils/ErrorLog/ErrorLog.h renamed to Amalgam/src/Utils/ExceptionHandler/ExceptionHandler.h

@@ -2,11 +2,11 @@
 #include "../Macros/Macros.h"
 #include <Windows.h>
 
-class CErrorLog
+class CExceptionHandler
 {
 public:
 	void Initialize(LPVOID lpParam = nullptr);
 	void Unload();
 };
 
-ADD_FEATURE_CUSTOM(CErrorLog, ErrorLog, U);
+ADD_FEATURE_CUSTOM(CExceptionHandler, ExceptionHandler, U);

Amalgam/src/Utils/Memory/Memory.cpp

@@ -3,10 +3,6 @@
 #include <format>
 #include <Psapi.h>
 
-#define INRANGE(x, a, b) (x >= a && x <= b) 
-#define GetBits(x) (INRANGE((x & (~0x20)),'A','F') ? ((x & (~0x20)) - 'A' + 0xA) : (INRANGE(x,'0','9') ? x - '0' : 0))
-#define GetBytes(x) (GetBits(x[0]) << 4 | GetBits(x[1]))
-
 std::vector<byte> CMemory::PatternToByte(const char* szPattern)
 {
 	std::vector<byte> vPattern = {};