From b172d20227e3d6eeddefe628cd47e653a865c0fa Mon Sep 17 00:00:00 2001 From: s1lentq Date: Mon, 7 Nov 2016 22:27:18 +0700 Subject: [PATCH] reset minor version --- gradle.properties | 2 +- rehlds/engine/common.h | 4 ++-- rehlds/engine/host_cmd.cpp | 2 +- rehlds/public/rehlds/rehlds_api.h | 2 +- rehlds/rehlds/hookchains_impl.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index cdf5124..abe9c92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ majorVersion=3 -minorVersion=13 +minorVersion=0 maintenanceVersion=0 diff --git a/rehlds/engine/common.h b/rehlds/engine/common.h index 599512d..e10aa1a 100644 --- a/rehlds/engine/common.h +++ b/rehlds/engine/common.h @@ -42,10 +42,10 @@ #define __BUILD_TIME__ "13:14:09" #define __BUILD_DATE__ "Aug 29 2013" #endif -#else +#else // REHLDS_FIXES #define __BUILD_TIME__ APP_COMMIT_TIME #define __BUILD_DATE__ APP_COMMIT_DATE -#endif +#endif // REHLDS_FIXES #ifdef HOOK_ENGINE #define serverinfo (*pserverinfo) diff --git a/rehlds/engine/host_cmd.cpp b/rehlds/engine/host_cmd.cpp index d3cc85d..46cdfbb 100644 --- a/rehlds/engine/host_cmd.cpp +++ b/rehlds/engine/host_cmd.cpp @@ -2436,7 +2436,7 @@ void Host_Version_f(void) #ifdef REHLDS_FIXES Con_Printf("ReHLDS version: " APP_VERSION "\n"); Con_Printf("Build date: " __BUILD_TIME__ " " __BUILD_DATE__ " (%i)\n", build_number()); - Con_Printf("Build from: "APP_COMMIT_URL APP_COMMIT_SHA"\n"); + Con_Printf("Build from: " APP_COMMIT_URL APP_COMMIT_SHA "\n"); #else Con_Printf("Exe build: " __BUILD_TIME__ " " __BUILD_DATE__ " (%i)\n", build_number()); #endif diff --git a/rehlds/public/rehlds/rehlds_api.h b/rehlds/public/rehlds/rehlds_api.h index 548e915..67ad71e 100644 --- a/rehlds/public/rehlds/rehlds_api.h +++ b/rehlds/public/rehlds/rehlds_api.h @@ -35,7 +35,7 @@ #include "model.h" #define REHLDS_API_VERSION_MAJOR 3 -#define REHLDS_API_VERSION_MINOR 13 +#define REHLDS_API_VERSION_MINOR 0 //Steam_NotifyClientConnect hook typedef IHookChain IRehldsHook_Steam_NotifyClientConnect; diff --git a/rehlds/rehlds/hookchains_impl.cpp b/rehlds/rehlds/hookchains_impl.cpp index 7b338fc..998572a 100644 --- a/rehlds/rehlds/hookchains_impl.cpp +++ b/rehlds/rehlds/hookchains_impl.cpp @@ -58,9 +58,9 @@ void AbstractHookChainRegistry::removeHook(void* hookFunc) { // erase hook for (int i = 0; i < m_NumHooks; i++) { - --m_NumHooks; if (hookFunc == m_Hooks[i]) { + --m_NumHooks; if (m_NumHooks != i) { Q_memmove(&m_Hooks[i], &m_Hooks[i + 1], (m_NumHooks - i) * sizeof(m_Hooks[0]));