R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement '-novid' param check

Browse Source 
the parameter check for '-novid' has been removed from S2 onwards, but later added back in. Our S3 build doesn't have it as well. This commit adds it back in and allows user to launch the game without the startup video's by adding '-novid' to the launch arguments. ('-dev' also works, but this enables developer and sv_cheats..).
This commit is contained in:
Kawe Mazidjatari 2022-09-25 13:36:55 +02:00
parent 94db7b2faa
commit bef7f352d6
9 changed files with 133 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
r5dev/core/init.cpp
View File

@ -86,6 +86,9 @@
#include "engine/sys_engine.h"
#include "engine/sys_utils.h"
#include "engine/sys_getmodes.h"
#ifndef DEDICATED
#include "engine/sys_mainwind.h"
#endif // !DEDICATED
#include "engine/gl_matsysiface.h"
#include "engine/gl_screen.h"
#ifndef DEDICATED
@ -214,6 +217,9 @@ void Systems_Init()
SysDll_Attach();
SysDll2_Attach();
SysUtils_Attach();
#ifndef DEDICATED
SysGame_Attach();
#endif // !DEDICATED
#ifndef DEDICATED
HCVideoMode_Common_Attach();
@ -343,6 +349,9 @@ void Systems_Shutdown()
SysDll_Detach();
SysDll2_Detach();
SysUtils_Detach();
#ifndef DEDICATED
SysGame_Detach();
#endif // DEDICATED
#ifndef DEDICATED
HCVideoMode_Common_Detach();

30
r5dev/engine/sys_mainwind.cpp Normal file
View File

@ -0,0 +1,30 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
//===========================================================================//
#include "core/stdafx.h"
#include "tier0/commandline.h"
#include "engine/sys_mainwind.h"
//-----------------------------------------------------------------------------
// Purpose: plays the startup video's
//-----------------------------------------------------------------------------
void CGame::PlayStartupVideos(void)
{
if (!CommandLine()->CheckParm("-novid"))
{
v_CGame__PlayStartupVideos();
}
}
///////////////////////////////////////////////////////////////////////////////
void SysGame_Attach()
{
DetourAttach((LPVOID*)&v_CGame__PlayStartupVideos, &CGame::PlayStartupVideos);
}
void SysGame_Detach()
{
DetourDetach((LPVOID*)&v_CGame__PlayStartupVideos, &CGame::PlayStartupVideos);
}

46
r5dev/engine/sys_mainwind.h Normal file
View File

@ -0,0 +1,46 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
//===========================================================================//
#include "public/igame.h"
inline CMemory p_CGame__PlayStartupVideos;
inline auto v_CGame__PlayStartupVideos = p_CGame__PlayStartupVideos.RCast<void (*)(void)>();
//-----------------------------------------------------------------------------
// Purpose: Main game interface, including message pump and window creation
//-----------------------------------------------------------------------------
class CGame : public IGame
{
public:
static void PlayStartupVideos(void);
};
void SysGame_Attach();
void SysGame_Detach();
///////////////////////////////////////////////////////////////////////////////
class VGame : public IDetour
{
virtual void GetAdr(void) const
{
spdlog::debug("| FUN: CGame::PlayStartupVideos : {:#18x} |\n", p_CGame__PlayStartupVideos.GetPtr());
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
{
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
p_CGame__PlayStartupVideos = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8B\xC4\x48\x81\xEC\x00\x00\x00\x00\x80\x3D\x00\x00\x00\x00\x00\x0F\x85\x00\x00\x00\x00\x48\x8B\x0D\x00\x00\x00\x00"), "xxxxxx????xx?????xx????xxx????");
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
p_CGame__PlayStartupVideos = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8B\xC4\x55\x48\x8D\xA8\x00\x00\x00\x00\x48\x81\xEC\x00\x00\x00\x00\x80\x3D\x00\x00\x00\x00\x00"), "xxxxxxx????xxx????xx?????");
#endif
v_CGame__PlayStartupVideos = p_CGame__PlayStartupVideos.RCast<void (*)(void)>();
}
virtual void GetVar(void) const { }
virtual void GetCon(void) const { }
virtual void Attach(void) const { }
virtual void Detach(void) const { }
};
///////////////////////////////////////////////////////////////////////////////
REGISTER(VGame);

10
r5dev/public/icommandline.h
View File

@ -10,16 +10,16 @@ public:
virtual const char* GetCmdLine(void) const = 0;
virtual const char* CheckParm(const char* psz, const char** ppszValue = NULL) const = 0;
virtual const char* CheckParm(const char* pszParm, const char** ppszValue = NULL) const = 0;
virtual void RemoveParm(const char* pszParm) = 0;
virtual void AppendParm(const char* pszParm, const char* pszValues) = 0;
virtual const char* ParmValue(const char* psz, const char* pDefaultVal = NULL) const = 0;
virtual int ParmValue(const char* psz, int nDefaultVal) const = 0;
virtual float ParmValue(const char* psz, float flDefaultVal) const = 0;
virtual const char* ParmValue(const char* pszParm, const char* pDefaultVal = NULL) const = 0;
virtual int ParmValue(const char* pszParm, int nDefaultVal) const = 0;
virtual float ParmValue(const char* pszParm, float flDefaultVal) const = 0;
virtual int ParmCount(void) const = 0;
virtual int FindParm(const char* psz) const = 0;
virtual int FindParm(const char* pszParm) const = 0;
virtual const char* GetParm(int nIndex) const = 0;
virtual bool GuardLocked(void) const = 0; // True = mutex locked.
virtual void SetParm(int nIndex, char const* pParm) = 0;

19
r5dev/public/igame.h Normal file
View File

@ -0,0 +1,19 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
// $Workfile: $
// $Date: $
// $NoKeywords: $
//===========================================================================//
#ifndef IGAME_H
#define IGAME_H
class IGame
{
public:
virtual ~IGame(void) { }
// TODO //
};
#endif // IGAME_H

3
r5dev/vproj/clientsdk.vcxproj
View File

@ -49,6 +49,7 @@
<ClCompile Include="..\engine\sys_dll2.cpp" />
<ClCompile Include="..\engine\sys_engine.cpp" />
<ClCompile Include="..\engine\sys_getmodes.cpp" />
<ClCompile Include="..\engine\sys_mainwind.cpp" />
<ClCompile Include="..\engine\sys_utils.cpp" />
<ClCompile Include="..\filesystem\basefilesystem.cpp" />
<ClCompile Include="..\filesystem\filesystem.cpp" />
@ -197,6 +198,7 @@
<ClInclude Include="..\engine\sys_dll2.h" />
<ClInclude Include="..\engine\sys_engine.h" />
<ClInclude Include="..\engine\sys_getmodes.h" />
<ClInclude Include="..\engine\sys_mainwind.h" />
<ClInclude Include="..\engine\sys_utils.h" />
<ClInclude Include="..\filesystem\basefilesystem.h" />
<ClInclude Include="..\filesystem\filesystem.h" />
@ -265,6 +267,7 @@
<ClInclude Include="..\public\ifile.h" />
<ClInclude Include="..\public\ifilesystem.h" />
<ClInclude Include="..\public\iframetask.h" />
<ClInclude Include="..\public\igame.h" />
<ClInclude Include="..\public\ihandleentity.h" />
<ClInclude Include="..\public\inetchannel.h" />
<ClInclude Include="..\public\inetmessage.h" />

9
r5dev/vproj/clientsdk.vcxproj.filters
View File

@ -597,6 +597,9 @@
<ClCompile Include="..\engine\client\cl_ents_parse.cpp">
<Filter>sdk\engine\client</Filter>
</ClCompile>
<ClCompile Include="..\engine\sys_mainwind.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -1760,6 +1763,12 @@
<ClInclude Include="..\engine\client\cl_ents_parse.h">
<Filter>sdk\engine\client</Filter>
</ClInclude>
<ClInclude Include="..\engine\sys_mainwind.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\public\igame.h">
<Filter>sdk\public</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">

3
r5dev/vproj/gamesdk.vcxproj
View File

@ -51,6 +51,7 @@
<ClCompile Include="..\engine\sys_dll2.cpp" />
<ClCompile Include="..\engine\sys_engine.cpp" />
<ClCompile Include="..\engine\sys_getmodes.cpp" />
<ClCompile Include="..\engine\sys_mainwind.cpp" />
<ClCompile Include="..\engine\sys_utils.cpp" />
<ClCompile Include="..\filesystem\basefilesystem.cpp" />
<ClCompile Include="..\filesystem\filesystem.cpp" />
@ -209,6 +210,7 @@
<ClInclude Include="..\engine\sys_dll2.h" />
<ClInclude Include="..\engine\sys_engine.h" />
<ClInclude Include="..\engine\sys_getmodes.h" />
<ClInclude Include="..\engine\sys_mainwind.h" />
<ClInclude Include="..\engine\sys_utils.h" />
<ClInclude Include="..\filesystem\basefilesystem.h" />
<ClInclude Include="..\filesystem\filesystem.h" />
@ -290,6 +292,7 @@
<ClInclude Include="..\public\ifile.h" />
<ClInclude Include="..\public\ifilesystem.h" />
<ClInclude Include="..\public\iframetask.h" />
<ClInclude Include="..\public\igame.h" />
<ClInclude Include="..\public\ihandleentity.h" />
<ClInclude Include="..\public\inetchannel.h" />
<ClInclude Include="..\public\inetmessage.h" />

9
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -636,6 +636,9 @@
<ClCompile Include="..\engine\client\cl_ents_parse.cpp">
<Filter>sdk\engine\client</Filter>
</ClCompile>
<ClCompile Include="..\engine\sys_mainwind.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -1847,6 +1850,12 @@
<ClInclude Include="..\engine\client\cl_ents_parse.h">
<Filter>sdk\engine\client</Filter>
</ClInclude>
<ClInclude Include="..\engine\sys_mainwind.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\public\igame.h">
<Filter>sdk\public</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">