diff options
Diffstat (limited to 'NorthstarDLL/core')
-rw-r--r-- | NorthstarDLL/core/convar/concommand.h | 10 | ||||
-rw-r--r-- | NorthstarDLL/core/convar/convar.h | 2 | ||||
-rw-r--r-- | NorthstarDLL/core/convar/cvar.h | 4 | ||||
-rw-r--r-- | NorthstarDLL/core/filesystem/filesystem.h | 4 | ||||
-rw-r--r-- | NorthstarDLL/core/filesystem/rpakfilesystem.h | 4 | ||||
-rw-r--r-- | NorthstarDLL/core/hooks.h | 16 | ||||
-rw-r--r-- | NorthstarDLL/core/math/bitbuf.h | 20 | ||||
-rw-r--r-- | NorthstarDLL/core/math/color.h | 4 | ||||
-rw-r--r-- | NorthstarDLL/core/memalloc.h | 2 | ||||
-rw-r--r-- | NorthstarDLL/core/memory.h | 10 | ||||
-rw-r--r-- | NorthstarDLL/core/sourceinterface.h | 4 | ||||
-rw-r--r-- | NorthstarDLL/core/tier0.h | 4 | ||||
-rw-r--r-- | NorthstarDLL/core/vanilla.h | 4 |
13 files changed, 44 insertions, 44 deletions
diff --git a/NorthstarDLL/core/convar/concommand.h b/NorthstarDLL/core/convar/concommand.h index c11c7ea4..71a82fec 100644 --- a/NorthstarDLL/core/convar/concommand.h +++ b/NorthstarDLL/core/convar/concommand.h @@ -4,7 +4,7 @@ class ConCommandBase; class IConCommandBaseAccessor { - public: +public: // Flags is a combination of FCVAR flags in cvar.h. // hOut is filled in with a handle to the variable. virtual bool RegisterConCommandBase(ConCommandBase* pVar) = 0; @@ -12,7 +12,7 @@ class IConCommandBaseAccessor class CCommand { - public: +public: CCommand() = delete; int64_t ArgC() const; @@ -24,7 +24,7 @@ class CCommand static int MaxCommandLength(); - private: +private: enum { COMMAND_MAX_ARGC = 64, @@ -88,7 +88,7 @@ typedef int (*FnCommandCompletionCallback)(const char* partial, char commands[CO // From r5reloaded class ConCommandBase { - public: +public: bool HasFlags(int nFlags); void AddFlags(int nFlags); void RemoveFlags(int nFlags); @@ -120,7 +120,7 @@ class ConCommand : public ConCommandBase { friend class CCVar; - public: +public: ConCommand(void) {}; // !TODO: Rebuild engine constructor in SDK instead. ConCommand(const char* szName, const char* szHelpString, int nFlags, void* pCallback, void* pCommandCompletionCallback); void Init(void); diff --git a/NorthstarDLL/core/convar/convar.h b/NorthstarDLL/core/convar/convar.h index 4b00e25f..f0366b46 100644 --- a/NorthstarDLL/core/convar/convar.h +++ b/NorthstarDLL/core/convar/convar.h @@ -124,7 +124,7 @@ typedef void (*FnChangeCallback_t)(ConVar* var, const char* pOldValue, float flO //----------------------------------------------------------------------------- class ConVar { - public: +public: ConVar(void) {}; ConVar(const char* pszName, const char* pszDefaultValue, int nFlags, const char* pszHelpString); ConVar( diff --git a/NorthstarDLL/core/convar/cvar.h b/NorthstarDLL/core/convar/cvar.h index 09fa8591..beaa84f4 100644 --- a/NorthstarDLL/core/convar/cvar.h +++ b/NorthstarDLL/core/convar/cvar.h @@ -13,7 +13,7 @@ class ConVar; //----------------------------------------------------------------------------- class CCVarIteratorInternal // Fully reversed table, just look at the virtual function table and rename the function. { - public: +public: virtual void SetFirst(void) = 0; // 0 virtual void Next(void) = 0; // 1 virtual bool IsValid(void) = 0; // 2 @@ -25,7 +25,7 @@ class CCVarIteratorInternal // Fully reversed table, just look at the virtual fu //----------------------------------------------------------------------------- class CCvar { - public: +public: M_VMETHOD(ConCommandBase*, FindCommandBase, 14, (const char* pszCommandName), (this, pszCommandName)); M_VMETHOD(ConVar*, FindVar, 16, (const char* pszVarName), (this, pszVarName)); M_VMETHOD(ConCommand*, FindCommand, 18, (const char* pszCommandName), (this, pszCommandName)); diff --git a/NorthstarDLL/core/filesystem/filesystem.h b/NorthstarDLL/core/filesystem/filesystem.h index 9c4e891b..fcd1bb2f 100644 --- a/NorthstarDLL/core/filesystem/filesystem.h +++ b/NorthstarDLL/core/filesystem/filesystem.h @@ -29,14 +29,14 @@ enum SearchPathAdd_t class CSearchPath { - public: +public: unsigned char unknown[0x18]; const char* debugPath; }; class IFileSystem { - public: +public: struct VTable { void* unknown[10]; diff --git a/NorthstarDLL/core/filesystem/rpakfilesystem.h b/NorthstarDLL/core/filesystem/rpakfilesystem.h index 3f608dba..bcd57a73 100644 --- a/NorthstarDLL/core/filesystem/rpakfilesystem.h +++ b/NorthstarDLL/core/filesystem/rpakfilesystem.h @@ -17,11 +17,11 @@ struct LoadedPak class PakLoadManager { - private: +private: std::map<int, LoadedPak> m_vLoadedPaks {}; std::unordered_map<size_t, int> m_HashToPakHandle {}; - public: +public: int LoadPakAsync(const char* pPath, const ePakLoadSource nLoadSource); void UnloadPak(const int nPakHandle); void UnloadMapPaks(); diff --git a/NorthstarDLL/core/hooks.h b/NorthstarDLL/core/hooks.h index 01244b3d..15edbf0b 100644 --- a/NorthstarDLL/core/hooks.h +++ b/NorthstarDLL/core/hooks.h @@ -25,7 +25,7 @@ enum class eDllLoadCallbackSide class __dllLoadCallback { - public: +public: __dllLoadCallback() = delete; __dllLoadCallback( eDllLoadCallbackSide side, @@ -67,7 +67,7 @@ class __autovar; class __fileAutohook { - public: +public: std::vector<__autohook*> hooks; std::vector<__autovar*> vars; @@ -91,7 +91,7 @@ uintptr_t ParseDLLOffsetString(const char* pAddrString); class __autohook { - public: +public: enum AddressResolutionMode { OFFSET_STRING, // we're using a string that of the format dllname.dll + offset @@ -111,7 +111,7 @@ class __autohook char* pModuleName; // for PROCADDRESS char* pProcName; // for PROCADDRESS - public: +public: __autohook() = delete; __autohook(__fileAutohook* autohook, const char* funcName, LPVOID absoluteAddress, LPVOID* orig, LPVOID func) @@ -250,13 +250,13 @@ class __autohook class ManualHook { - public: +public: char* pFuncName; LPVOID pHookFunc; LPVOID* ppOrigFunc; - public: +public: ManualHook() = delete; ManualHook(const char* funcName, LPVOID func); ManualHook(const char* funcName, LPVOID* orig, LPVOID func); @@ -284,11 +284,11 @@ void MakeHook(LPVOID pTarget, LPVOID pDetour, void* ppOriginal, const char* pFun class __autovar { - public: +public: char* m_pAddrString; void** m_pTarget; - public: +public: __autovar(__fileAutohook* pAutohook, const char* pAddrString, void** pTarget) { m_pTarget = pTarget; diff --git a/NorthstarDLL/core/math/bitbuf.h b/NorthstarDLL/core/math/bitbuf.h index 8e8e216f..5ca75455 100644 --- a/NorthstarDLL/core/math/bitbuf.h +++ b/NorthstarDLL/core/math/bitbuf.h @@ -89,13 +89,13 @@ enum EBitCoordType class BitBufferBase { - protected: +protected: INLINE void SetName(const char* name) { m_BufferName = name; } - public: +public: INLINE bool IsOverflowed() { return m_Overflow; @@ -110,16 +110,16 @@ class BitBufferBase return m_BufferName; } - private: +private: const char* m_BufferName = ""; - protected: +protected: u8 m_Overflow = false; }; class BFRead : public BitBufferBase { - public: +public: BFRead() = default; INLINE BFRead(uptr data, size_t byteLength, size_t startPos = 0, const char* bufferName = 0) @@ -130,7 +130,7 @@ class BFRead : public BitBufferBase SetName(bufferName); } - public: +public: INLINE void StartReading(uptr data, size_t byteLength, size_t startPos = 0) { m_Data = reinterpret_cast<u32 const*>(data); @@ -706,7 +706,7 @@ class BFRead : public BitBufferBase return GetNumBitsLeft() >> 3; } - private: +private: size_t m_DataBits; // 0x0010 size_t m_DataBytes; // 0x0018 @@ -720,7 +720,7 @@ class BFRead : public BitBufferBase class BFWrite : public BitBufferBase { - public: +public: BFWrite() = default; INLINE BFWrite(uptr data, size_t byteLength, const char* bufferName = 0) @@ -731,7 +731,7 @@ class BFWrite : public BitBufferBase SetName(bufferName); } - public: +public: INLINE void StartWriting(uptr data, size_t byteLength) { m_Data = reinterpret_cast<u32*>(data); @@ -1131,7 +1131,7 @@ class BFWrite : public BitBufferBase WriteBitVec3Coord(tmp); }*/ - private: +private: size_t m_DataBits = 0; size_t m_DataBytes = 0; diff --git a/NorthstarDLL/core/math/color.h b/NorthstarDLL/core/math/color.h index 76cf8a47..013c4e4c 100644 --- a/NorthstarDLL/core/math/color.h +++ b/NorthstarDLL/core/math/color.h @@ -57,7 +57,7 @@ struct SourceColor //----------------------------------------------------------------------------- class Color { - public: +public: Color(int r, int g, int b, int a = 255) { _color[0] = (unsigned char)r; @@ -169,7 +169,7 @@ class Color return SourceColor(_color[0], _color[1], _color[2], _color[3]); } - private: +private: unsigned char _color[4]; }; diff --git a/NorthstarDLL/core/memalloc.h b/NorthstarDLL/core/memalloc.h index 97f60012..2f383335 100644 --- a/NorthstarDLL/core/memalloc.h +++ b/NorthstarDLL/core/memalloc.h @@ -17,7 +17,7 @@ void operator delete(void* p) noexcept; class SourceAllocator { - public: +public: static const bool kNeedFree = true; void* Malloc(size_t size) { diff --git a/NorthstarDLL/core/memory.h b/NorthstarDLL/core/memory.h index db0a38b3..a978963e 100644 --- a/NorthstarDLL/core/memory.h +++ b/NorthstarDLL/core/memory.h @@ -2,10 +2,10 @@ class CMemoryAddress { - public: +public: uintptr_t m_nAddress; - public: +public: CMemoryAddress(); CMemoryAddress(const uintptr_t nAddress); CMemoryAddress(const void* pAddress); @@ -47,7 +47,7 @@ class CMemoryAddress // based on https://github.com/Mauler125/r5sdk/blob/master/r5dev/public/include/module.h class CModule : public CMemoryAddress { - public: +public: struct ModuleSections_t { ModuleSections_t(void) = default; @@ -71,7 +71,7 @@ class CModule : public CMemoryAddress ModuleSections_t m_RunTimeData; ModuleSections_t m_ReadOnlyData; - private: +private: std::string m_svModuleName; uintptr_t m_pModuleBase {}; DWORD m_nModuleSize {}; @@ -79,7 +79,7 @@ class CModule : public CMemoryAddress IMAGE_DOS_HEADER* m_pDOSHeader = nullptr; std::vector<ModuleSections_t> m_vModuleSections; - public: +public: CModule() = delete; // no default, we need a module name CModule(const HMODULE pModule); CModule(const char* pModuleName); diff --git a/NorthstarDLL/core/sourceinterface.h b/NorthstarDLL/core/sourceinterface.h index 474e961b..7b5e81f3 100644 --- a/NorthstarDLL/core/sourceinterface.h +++ b/NorthstarDLL/core/sourceinterface.h @@ -6,10 +6,10 @@ typedef void* (*CreateInterfaceFn)(const char* pName, int* pReturnCode); template <typename T> class SourceInterface { - private: +private: T* m_interface; - public: +public: SourceInterface(const std::string& moduleName, const std::string& interfaceName) { HMODULE handle = GetModuleHandleA(moduleName.c_str()); diff --git a/NorthstarDLL/core/tier0.h b/NorthstarDLL/core/tier0.h index 047610b2..cc9af39e 100644 --- a/NorthstarDLL/core/tier0.h +++ b/NorthstarDLL/core/tier0.h @@ -2,7 +2,7 @@ class IMemAlloc { - public: +public: struct VTable { void* unknown[1]; // alloc debug @@ -25,7 +25,7 @@ class IMemAlloc class CCommandLine { - public: +public: // based on the defs in the 2013 source sdk, but for some reason has an extra function (may be another CreateCmdLine overload?) // these seem to line up with what they should be though virtual void CreateCmdLine(const char* commandline) = 0; diff --git a/NorthstarDLL/core/vanilla.h b/NorthstarDLL/core/vanilla.h index fb809a1a..b0797803 100644 --- a/NorthstarDLL/core/vanilla.h +++ b/NorthstarDLL/core/vanilla.h @@ -6,7 +6,7 @@ /// as well as various other small changes for compatibility class VanillaCompatibility { - public: +public: void SetVanillaCompatibility(bool isVanilla) { static bool bInitialised = false; @@ -22,7 +22,7 @@ class VanillaCompatibility return m_bIsVanillaCompatible; } - private: +private: bool m_bIsVanillaCompatible = false; }; |