From 4e3e9351fe9d7dd90a78400f45e2d05b2b72b9b0 Mon Sep 17 00:00:00 2001 From: s1lentq Date: Mon, 1 Feb 2016 16:46:31 +0600 Subject: [PATCH] When using the func_tank reset the FOV and hide the v_ model of knife etc. --- .../src/main/groovy/versioning/RegamedllVersionInfo.groovy | 4 +++- regamedll/build.gradle | 2 ++ regamedll/dlls/func_tank.cpp | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/versioning/RegamedllVersionInfo.groovy b/buildSrc/src/main/groovy/versioning/RegamedllVersionInfo.groovy index 64d92985..273aa15d 100644 --- a/buildSrc/src/main/groovy/versioning/RegamedllVersionInfo.groovy +++ b/buildSrc/src/main/groovy/versioning/RegamedllVersionInfo.groovy @@ -29,7 +29,9 @@ class RegamedllVersionInfo { return sb.toString() } String asVersion() { - sprintf("%i.%i.%i", majorVersion, minorVersion, countCommit) + StringBuilder sb = new StringBuilder() + sb.append(majorVersion).append('.' + minorVersion).append('.' + countCommit); + return sb; } String asMavenVersion() { format('.', '-', true) diff --git a/regamedll/build.gradle b/regamedll/build.gradle index 20288589..04bddde1 100644 --- a/regamedll/build.gradle +++ b/regamedll/build.gradle @@ -427,5 +427,7 @@ task generateAppVersion { renderedFile.delete() renderedFile.write(content, 'utf-8') + + println 'The current ReGameDLL version is ' + verInfo.asVersion().toString() + ', maven version is ' + verInfo.asMavenVersion().toString(); } } diff --git a/regamedll/dlls/func_tank.cpp b/regamedll/dlls/func_tank.cpp index f0642851..1e3b96ed 100644 --- a/regamedll/dlls/func_tank.cpp +++ b/regamedll/dlls/func_tank.cpp @@ -269,7 +269,10 @@ BOOL CFuncTank::StartControl(CBasePlayer *pController) { m_pController->m_pActiveItem->Holster(); m_pController->pev->weaponmodel = 0; - //m_pController->pev->viewmodel = 0; +#ifdef REGAMEDLL_FIXES + m_pController->pev->viewmodel = 0; + m_pController->m_iFOV = DEFAULT_FOV; +#endif // REGAMEDLL_FIXES } m_pController->m_iHideHUD |= HIDEHUD_WEAPONS;