GitHub/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-10-16 23:37:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move some new features to REGAMEDLL_ADD

Browse Source
This commit is contained in:
s1lent 2019-12-17 21:19:52 +07:00
parent ded6b32e85
commit 3b612dc857
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
regamedll/dlls/game.cpp
View File

@ -94,6 +94,13 @@ cvar_t sk_scientist_heal1 = { "sk_scientist_heal1", "0", 0, 0.0f, nullptr };
cvar_t sk_scientist_heal2 = { "sk_scientist_heal2", "0", 0, 0.0f, nullptr };
cvar_t sk_scientist_heal3 = { "sk_scientist_heal3", "0", 0, 0.0f, nullptr };
#ifdef BUILD_LATEST
cvar_t scoreboard_showmoney = { "mp_scoreboard_showmoney", "3", FCVAR_SERVER, 0.0f, nullptr };
cvar_t scoreboard_showhealth = { "mp_scoreboard_showhealth", "3", FCVAR_SERVER, 0.0f, nullptr };
#endif
#ifdef REGAMEDLL_ADD
cvar_t game_version = { "game_version", APP_VERSION, FCVAR_SERVER, 0.0f, nullptr };
@ -131,9 +138,6 @@ cvar_t allow_point_servercommand = { "mp_allow_point_servercommand", "0", 0, 0.0
cvar_t hullbounds_sets = { "mp_hullbounds_sets", "1", 0, 0.0f, nullptr };
cvar_t unduck_method = { "mp_unduck_method", "0", 0, 0.0f, nullptr };
cvar_t scoreboard_showmoney = { "mp_scoreboard_showmoney", "3", FCVAR_SERVER, 0.0f, nullptr };
cvar_t scoreboard_showhealth = { "mp_scoreboard_showhealth", "3", FCVAR_SERVER, 0.0f, nullptr };
cvar_t ff_damage_reduction_bullets = { "ff_damage_reduction_bullets", "0.35", FCVAR_SERVER, 0.0f, nullptr };
cvar_t ff_damage_reduction_grenade = { "ff_damage_reduction_grenade", "0.25", FCVAR_SERVER, 0.0f, nullptr };
cvar_t ff_damage_reduction_grenade_self = { "ff_damage_reduction_grenade_self", "1", FCVAR_SERVER, 0.0f, nullptr };
@ -332,7 +336,7 @@ void EXT_FUNC GameDLLInit()
{
CVAR_REGISTER(&show_scenarioicon);
}
CVAR_REGISTER(&old_bomb_defused_sound);
CVAR_REGISTER(&item_staytime);
CVAR_REGISTER(&legacy_bombtarget_touch);

17
regamedll/dlls/triggers.cpp
View File

@ -1858,12 +1858,19 @@ void CBombTarget::BombTargetTouch(CBaseEntity *pOther)
CBasePlayer *pPlayer = static_cast<CBasePlayer *>(pOther);
if (pPlayer->m_bHasC4
#ifdef REGAMEDLL_FIXES
&& (legacy_bombtarget_touch.value || IsPlayerInBombSite(pPlayer))
#endif
)
if (pPlayer->m_bHasC4)
{
#ifdef REGAMEDLL_ADD
if (!legacy_bombtarget_touch.value)
#endif
{
#ifdef REGAMEDLL_FIXES
if (!IsPlayerInBombSite(pPlayer))
return;
#endif
}
pPlayer->m_signals.Signal(SIGNAL_BOMB);
pPlayer->m_pentCurBombTarget = ENT(pev);
}

4
regamedll/dlls/weapons.cpp
View File

@ -2176,13 +2176,15 @@ void CArmoury::Spawn()
void CArmoury::Restart()
{
#ifdef REGAMEDLL_FIXES
#ifdef REGAMEDLL_ADD
if (!weapons_allow_map_placed.value)
{
Hide();
return;
}
#endif
#ifdef REGAMEDLL_FIXES
// This code refers to the mode of Escape. (Because there is relationship to the team Terrorists)
if (CSGameRules()->m_bMapHasEscapeZone)
#endif

2
regamedll/msvc/ReGameDLL.vcxproj
View File

@ -810,7 +810,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{70A2B904-B7DB-4C48-8DE0-AF567360D572}</ProjectGuid>
<RootNamespace>ReGameDLL</RootNamespace>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">