diff --git a/.gitignore b/.gitignore index 3b70a53..543ff4f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ **/msvc/ipch **/PublishPath*.txt **/Server*.bat +**/publish/* **/*.log diff --git a/Makefile b/Makefile index 18f3f01..7bbd919 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ COMPILER = /opt/intel/bin/icpc OBJECTS = src/main.cpp src/meta_api.cpp src/dllapi.cpp\ src/cmdexec.cpp src/engine_rehlds.cpp src/h_export.cpp\ - src/resource.cpp src/sdk_util.cpp public/interface.cpp + src/resource.cpp src/sdk_util.cpp public/interface.cpp\ +########src/config.cpp src/task.cpp LINK = -lm -ldl -static-intel -static-libgcc -no-intel-extensions diff --git a/dist/resources.ini b/dist/resources.ini index a4752da..4f387a5 100644 --- a/dist/resources.ini +++ b/dist/resources.ini @@ -13,7 +13,7 @@ # path to file hash (exec cmd) # "../opengl32.dll" c8005c526355d8015d462dc7f4ddb159 "kick [userid]" # -# NOTE: Hash enough 4 bytes (or 8 characters) +# NOTE: Hash enough of 4 bytes (or 8 characters) # -> Example # full md5 hash: c8005c526355d8015d462dc7f4ddb159 # 4 bytes from the hash: c8005c52 diff --git a/msvc/rechecker.vcxproj b/msvc/rechecker.vcxproj index 1e1eccc..76c8656 100644 --- a/msvc/rechecker.vcxproj +++ b/msvc/rechecker.vcxproj @@ -268,8 +268,7 @@ rechecker.def - IF EXIST "$(ProjectDir)PostBuild.bat" (CALL "$(ProjectDir)PostBuild.bat" "$(TargetDir)" "$(TargetName)" "$(TargetExt)" "$(ProjectDir)") -REM IF EXIST "$(ProjectDir)ServerStart_cs_6153.bat" (CALL "$(ProjectDir)ServerStart_cs_6153.bat" "$(ProjectDir)..\" "$(ProjectDir)..\") + IF EXIST "$(ProjectDir)PostBuild.bat" (CALL "$(ProjectDir)PostBuild.bat" "$(TargetDir)" "$(TargetName)" "$(TargetExt)" "$(ProjectDir)") Automatic deployment script @@ -301,11 +300,11 @@ REM IF EXIST "$(ProjectDir)ServerStart_cs_6153.bat" (CALL "$(ProjectDir)ServerSt NotSet - None + ProgramDatabase Windows - false + true true true psapi.lib;%(AdditionalDependencies) diff --git a/src/main.cpp b/src/main.cpp index bc16727..e7dfb98 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -43,8 +43,10 @@ bool OnMetaAttach() void OnMetaDetach() { + g_RehldsApi->GetHookchains()->SV_DropClient()->unregisterHook(&SV_DropClient); + g_RehldsApi->GetHookchains()->SV_ActivateServer()->unregisterHook(&SV_ActivateServer); g_RehldsApi->GetHookchains()->SV_CheckConsistencyResponce()->unregisterHook(&SV_CheckConsistencyResponce); - + // clear Exec.Clear(); /*Task.Clear();*/ diff --git a/src/main.h b/src/main.h index d754e98..c302874 100644 --- a/src/main.h +++ b/src/main.h @@ -1,11 +1,12 @@ #pragma once -void StartFrame(); void SV_ActivateServer(IRehldsHook_SV_ActivateServer *chain, int runPhysics); void SV_DropClient(IRehldsHook_SV_DropClient *chain, IGameClient *pClient, bool crash, const char *string); bool SV_CheckConsistencyResponce(IRehldsHook_SV_CheckConsistencyResponce *chain, IGameClient *pSenderClient, resource_t *resource, uint32 hash); /* +void StartFrame(); extern DLL_FUNCTIONS *g_pFunctionTable; */ + extern void (*SV_AddResource)(resourcetype_t type, const char *name, int size, unsigned char flags, int index); diff --git a/src/meta_api.cpp b/src/meta_api.cpp index 5b95524..be98b89 100644 --- a/src/meta_api.cpp +++ b/src/meta_api.cpp @@ -4,7 +4,7 @@ plugin_info_t Plugin_info = { META_INTERFACE_VERSION, "Rechecker", - "1.1", + "1.0", __DATE__, "s1lent", "http://www.dedicated-server.ru/", diff --git a/src/precompiled.h b/src/precompiled.h index cd7d5a6..6adb1bf 100644 --- a/src/precompiled.h +++ b/src/precompiled.h @@ -23,10 +23,9 @@ #include "rehlds_api.h" #include "engine_rehlds.h" -//#include "main.h" +#include "main.h" //#include "task.h" - -#include "config.h" +//#include "config.h" #include "resource.h" #include "cmdexec.h" //#include "sdk_util.h" // UTIL_LogPrintf, etc diff --git a/src/resource.cpp b/src/resource.cpp index e6b2a2e..e63bd17 100644 --- a/src/resource.cpp +++ b/src/resource.cpp @@ -38,6 +38,7 @@ void CResourceFile::CreateResourceList() void CResourceFile::Clear() { m_PrevHash = 0; + m_DecalsNum = 0; // clear resources m_resourceList.clear(); diff --git a/src/task.cpp b/src/task.cpp index c70faf3..96dcbfc 100644 --- a/src/task.cpp +++ b/src/task.cpp @@ -38,6 +38,7 @@ void CTaskMngr::StartFrame() continue; } + // is call a callback pTask->Handler(); // erase task