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

Use abstract class for CCommandLine

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-08-20 03:15:51 +02:00
parent 55a620aa4d
commit 5284e8987f
4 changed files with 26 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
r5dev/launcher/launcher.cpp
View File

@ -6,6 +6,7 @@
//===========================================================================//
#include "core/stdafx.h"
#include "tier0/commandline.h"
#include "tier1/strtools.h"
#include "launcher/launcher.h"
int HWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
@ -47,9 +48,9 @@ void RemoveSpuriousGameParameters()
char lastGameArg[MAX_PATH];
for (int i = 0; i < CommandLine()->ParmCount() - 1; i++)
{
if (_stricmp(CommandLine()->GetParm(i), "-game") == 0)
if (Q_stricmp(CommandLine()->GetParm(i), "-game") == 0)
{
_snprintf(lastGameArg, sizeof(lastGameArg), "\"%s\"", CommandLine()->GetParm(i + 1));
Q_snprintf(lastGameArg, sizeof(lastGameArg), "\"%s\"", CommandLine()->GetParm(i + 1));
++nGameArgs;
++i;
}

25
r5dev/public/icommandline.h
View File

@ -1,9 +1,30 @@
#ifndef ICOMMANDLINE_H
#define ICOMMANDLINE_H
class ICommandLine
abstract_class ICommandLine
{
void* __vftable /*VFT*/;
public:
virtual void CreateCmdLine(const char* pszCommandline) = 0;
virtual void CreateCmdLine(int argc, char** argv) = 0;
virtual void CreatePool(void* pMem) = 0;
virtual const char* GetCmdLine(void) const = 0;
virtual const char* CheckParm(const char* psz, 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 int ParmCount(void) const = 0;
virtual int FindParm(const char* psz) 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;
virtual void CleanUpParms(void) = 0;
};
#endif // ICOMMANDLINE_H

149
r5dev/tier0/commandline.cpp
View File

@ -8,155 +8,6 @@
#include "tier0/commandline.h"
#include "tier1/cvar.h"
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
CCommandLine::CCommandLine(void)
{
m_pszCmdLine = NULL;
m_nParmCount = 0;
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
CCommandLine::~CCommandLine(void)
{
CleanUpParms();
delete[] m_pszCmdLine;
}
//-----------------------------------------------------------------------------
// Purpose: Create a command line from the passed in string
// Note that if you pass in a @filename, then the routine will read settings
// from a file instead of the command line
//-----------------------------------------------------------------------------
void CCommandLine::CreateCmdLine(const char* pszCommandline)
{
const int index = 0;
CallVFunc<void>(index, this, pszCommandline);
}
//-----------------------------------------------------------------------------
// Purpose: creates a command line from the arguments passed in
//-----------------------------------------------------------------------------
void CCommandLine::CreateCmdLine(int argc, char** argv)
{
const int index = 1;
CallVFunc<void>(index, this, argc, argv);
}
//-----------------------------------------------------------------------------
// Purpose: allocates a pool for the command line [seems unused]
//-----------------------------------------------------------------------------
void CCommandLine::CreatePool(void* pMem)
{
const int index = 2;
CallVFunc<void>(index, this, pMem);
}
//-----------------------------------------------------------------------------
// Purpose: Return current command line
// Output : const char
//-----------------------------------------------------------------------------
const char* CCommandLine::GetCmdLine(void)
{
const int index = 3;
return CallVFunc<const char*>(index, this);
}
//-----------------------------------------------------------------------------
// Purpose: Search for the parameter in the current commandline
// Input : *psz -
// **ppszValue -
// Output : char
//-----------------------------------------------------------------------------
const char* CCommandLine::CheckParm(const char* psz, const char** ppszValue)
{
const int index = 4;
return CallVFunc<const char*>(index, this, psz, ppszValue);
}
//-----------------------------------------------------------------------------
// Purpose: Remove specified string ( and any args attached to it ) from command line
// Input : *pszParm -
//-----------------------------------------------------------------------------
void CCommandLine::RemoveParm(const char* pszParm)
{
const int index = 5;
CallVFunc<void>(index, this, pszParm);
}
//-----------------------------------------------------------------------------
// Purpose: Append parameter and argument values to command line
// Input : *pszParm -
// *pszValues -
//-----------------------------------------------------------------------------
void CCommandLine::AppendParm(const char* pszParm, const char* pszValues)
{
const int index = 6;
CallVFunc<void>(index, this, pszParm, pszValues);
}
//-----------------------------------------------------------------------------
// Purpose: returns the argument after the one specified, or the default if not found
//-----------------------------------------------------------------------------
float CCommandLine::ParmValue(const char* psz, float flDefaultVal)
{
const int index = 7;
return CallVFunc<float>(index, this, psz, flDefaultVal);
}
int CCommandLine::ParmValue(const char* psz, int nDefaultVal)
{
const int index = 8;
return CallVFunc<int>(index, this, psz, nDefaultVal);
}
const char* CCommandLine::ParmValue(const char* psz, const char* pDefaultVal)
{
const int index = 9;
return CallVFunc<const char*>(index, this, psz, pDefaultVal);
}
//-----------------------------------------------------------------------------
// Purpose: returns individual command line arguments
//-----------------------------------------------------------------------------
int CCommandLine::ParmCount(void)
{
const int index = 10;
return CallVFunc<int>(index, this);
}
int CCommandLine::FindParm(const char* psz)
{
const int index = 11;
return CallVFunc<int>(index, this, psz);
}
const char* CCommandLine::GetParm(int nIndex)
{
const int index = 12;
return CallVFunc<const char*>(index, this, nIndex);
}
void CCommandLine::SetParm(int nIndex, char const* pParm)
{
const int index = 14;
CallVFunc<void>(index, this, nIndex, pParm);
}
//-----------------------------------------------------------------------------
// Individual command line arguments
//-----------------------------------------------------------------------------
void CCommandLine::CleanUpParms(void)
{
for (int i = 0; i < m_nParmCount; ++i)
{
delete[] m_ppParms[i];
m_ppParms[i] = NULL;
}
m_nParmCount = 0;
}
//-----------------------------------------------------------------------------
// Instance singleton and expose interface to rest of code
//-----------------------------------------------------------------------------

25
r5dev/tier0/commandline.h
View File

@ -3,31 +3,6 @@
class CCommandLine : public ICommandLine // VTABLE @0x141369C78 in R5pc_r5launch_N1094_CL456479_2019_10_30_05_20_PM
{
public:
CCommandLine(void);
~CCommandLine(void);
void CreateCmdLine(const char* pszCommandline);
void CreateCmdLine(int argc, char** argv);
void CreatePool(void* pMem);
const char* GetCmdLine(void);
const char* CheckParm(const char* psz, const char** ppszValue = NULL);
void RemoveParm(const char* pszParm);
void AppendParm(const char* pszParm, const char* pszValues);
const char* ParmValue(const char* psz, const char* pDefaultVal = NULL);
int ParmValue(const char* psz, int nDefaultVal);
float ParmValue(const char* psz, float flDefaultVal);
int ParmCount(void);
int FindParm(const char* psz);
const char* GetParm(int nIndex);
void SetParm(int nIndex, char const* pParm);
void CleanUpParms(void);
private:
enum
{