Skip to content

Commit

Permalink
Format project
Browse files Browse the repository at this point in the history
  • Loading branch information
Northstar committed Dec 20, 2023
1 parent 714282b commit 1e5c4a7
Show file tree
Hide file tree
Showing 39 changed files with 134 additions and 134 deletions.
6 changes: 3 additions & 3 deletions NorthstarDLL/client/audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ enum class AudioSelectionStrategy

class EventOverrideData
{
public:
public:
EventOverrideData(const std::string&, const fs::path&);
EventOverrideData();

public:
public:
bool LoadedSuccessfully = false;

std::vector<std::string> EventIds = {};
Expand All @@ -34,7 +34,7 @@ class EventOverrideData

class CustomAudioManager
{
public:
public:
bool TryLoadAudioOverride(const fs::path&);
void ClearAudioOverrides();

Expand Down
12 changes: 6 additions & 6 deletions NorthstarDLL/client/localchatwriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ class vgui_BaseRichText_vtable;

class vgui_BaseRichText
{
public:
public:
vgui_BaseRichText_vtable* vtable;
};

class vgui_BaseRichText_vtable
{
public:
public:
char unknown1[1880];

void(__fastcall* InsertChar)(vgui_BaseRichText* self, wchar_t ch);
Expand Down Expand Up @@ -49,7 +49,7 @@ class vgui_BaseRichText_vtable

class CGameSettings
{
public:
public:
char unknown1[92];
int isChatEnabled;
};
Expand All @@ -58,7 +58,7 @@ class CGameSettings
// have their value at the same offset
class CGameFloatVar
{
public:
public:
char unknown1[88];
float value;
};
Expand Down Expand Up @@ -101,7 +101,7 @@ Color lightColors[8] = {

class AnsiEscapeParser
{
public:
public:
explicit AnsiEscapeParser(LocalChatWriter* writer) : m_writer(writer) {}

void HandleVal(unsigned long val)
Expand Down Expand Up @@ -129,7 +129,7 @@ class AnsiEscapeParser
}
}

private:
private:
enum class Next
{
ControlType,
Expand Down
6 changes: 3 additions & 3 deletions NorthstarDLL/client/localchatwriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class vgui_BaseRichText;

class CHudChat
{
public:
public:
static CHudChat** allHuds;

char unknown1[720];
Expand All @@ -29,7 +29,7 @@ class CHudChat

class LocalChatWriter
{
public:
public:
enum Context
{
NetworkContext = 0,
Expand All @@ -56,7 +56,7 @@ class LocalChatWriter
void InsertColorChange(Color color);
void InsertSwatchColorChange(SwatchColor color);

private:
private:
Context m_context;

const char* ApplyAnsiEscape(const char* escape);
Expand Down
10 changes: 5 additions & 5 deletions NorthstarDLL/core/convar/concommand.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
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;
};

class CCommand
{
public:
public:
CCommand() = delete;

int64_t ArgC() const;
Expand All @@ -24,7 +24,7 @@ class CCommand

static int MaxCommandLength();

private:
private:
enum
{
COMMAND_MAX_ARGC = 64,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion NorthstarDLL/core/convar/convar.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions NorthstarDLL/core/convar/cvar.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions NorthstarDLL/core/filesystem/filesystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions NorthstarDLL/core/filesystem/rpakfilesystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
16 changes: 8 additions & 8 deletions NorthstarDLL/core/hooks.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ enum class eDllLoadCallbackSide

class __dllLoadCallback
{
public:
public:
__dllLoadCallback() = delete;
__dllLoadCallback(
eDllLoadCallbackSide side,
Expand Down Expand Up @@ -67,7 +67,7 @@ class __autovar;

class __fileAutohook
{
public:
public:
std::vector<__autohook*> hooks;
std::vector<__autovar*> vars;

Expand All @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions NorthstarDLL/core/math/bitbuf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand All @@ -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);
Expand Down Expand Up @@ -706,7 +706,7 @@ class BFRead : public BitBufferBase
return GetNumBitsLeft() >> 3;
}

private:
private:
size_t m_DataBits; // 0x0010
size_t m_DataBytes; // 0x0018

Expand All @@ -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)
Expand All @@ -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);
Expand Down Expand Up @@ -1131,7 +1131,7 @@ class BFWrite : public BitBufferBase
WriteBitVec3Coord(tmp);
}*/

private:
private:
size_t m_DataBits = 0;
size_t m_DataBytes = 0;

Expand Down
4 changes: 2 additions & 2 deletions NorthstarDLL/core/math/color.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -169,7 +169,7 @@ class Color
return SourceColor(_color[0], _color[1], _color[2], _color[3]);
}

private:
private:
unsigned char _color[4];
};

Expand Down
2 changes: 1 addition & 1 deletion NorthstarDLL/core/memalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void operator delete(void* p) noexcept;

class SourceAllocator
{
public:
public:
static const bool kNeedFree = true;
void* Malloc(size_t size)
{
Expand Down
Loading

0 comments on commit 1e5c4a7

Please sign in to comment.