Skip to content

Added/Updated some things #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 27, 2025
Merged

Added/Updated some things #115

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b2ff3cf
Added all pooled strings.
RaphaelIT7 Mar 17, 2025
bd96288
Updated lua_typename
RaphaelIT7 Mar 17, 2025
a5dfa04
Allow one to directly use the ILuaInterface instead of the ILuaBase
RaphaelIT7 Mar 17, 2025
b1c7e40
Merge branch 'master' into patch-4
RaphaelIT7 May 18, 2025
59464d2
Update some GarrysMod files
RaphaelIT7 May 18, 2025
80fe20a
Update some args in GarrysMod files
RaphaelIT7 May 18, 2025
8482181
Also update this file
RaphaelIT7 May 18, 2025
d0c3c7f
Fix a typo
RaphaelIT7 May 18, 2025
b56279f
Update the Windows symbol
RaphaelIT7 Jun 27, 2025
faae159
Requested changes + Updated some things
RaphaelIT7 Jul 27, 2025
d7a956e
Misc changes
danielga Jul 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions include/GarrysMod/Lua/Interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
#ifndef GARRYSMOD_LUA_INTERFACE_H
#define GARRYSMOD_LUA_INTERFACE_H

#ifdef GMOD_USE_ILUAINTERFACE
#include "LuaInterface.h"
#define GMOD_LUACLASS GarrysMod::Lua::ILuaInterface*
#else
#include "LuaBase.h"
#define GMOD_LUACLASS GarrysMod::Lua::ILuaBase*
#endif

struct lua_State
{
Expand All @@ -17,7 +23,7 @@ struct lua_State
#error Unsupported platform
#endif

GarrysMod::Lua::ILuaBase* luabase;
GMOD_LUACLASS luabase;
};

#ifndef GMOD
Expand All @@ -38,40 +44,40 @@ struct lua_State
#define LUA_FUNCTION_STATIC( name ) static LUA_FUNCTION( name )
#else
#define GMOD_MODULE_OPEN() \
int gmod13_open__Imp( GarrysMod::Lua::ILuaBase* LUA ); \
int gmod13_open__Imp( GMOD_LUACLASS LUA ); \
GMOD_DLL_EXPORT int gmod13_open( lua_State* L ) \
{ \
return gmod13_open__Imp( L->luabase ); \
} \
int gmod13_open__Imp( [[maybe_unused]] GarrysMod::Lua::ILuaBase* LUA )
int gmod13_open__Imp( [[maybe_unused]] GMOD_LUACLASS LUA )

#define GMOD_MODULE_CLOSE() \
int gmod13_close__Imp( GarrysMod::Lua::ILuaBase* LUA ); \
int gmod13_close__Imp( GMOD_LUACLASS LUA ); \
GMOD_DLL_EXPORT int gmod13_close( lua_State* L ) \
{ \
return gmod13_close__Imp( L->luabase ); \
} \
int gmod13_close__Imp( [[maybe_unused]] GarrysMod::Lua::ILuaBase* LUA )
int gmod13_close__Imp( [[maybe_unused]] GMOD_LUACLASS LUA )

#define LUA_FUNCTION( FUNC ) \
int FUNC##__Imp( GarrysMod::Lua::ILuaBase* LUA ); \
int FUNC##__Imp( GMOD_LUACLASS LUA ); \
int FUNC( lua_State* L ) \
{ \
GarrysMod::Lua::ILuaBase* LUA = L->luabase; \
GMOD_LUACLASS LUA = L->luabase; \
LUA->SetState(L); \
return FUNC##__Imp( LUA ); \
} \
int FUNC##__Imp( [[maybe_unused]] GarrysMod::Lua::ILuaBase* LUA )
int FUNC##__Imp( [[maybe_unused]] GMOD_LUACLASS LUA )

#define LUA_FUNCTION_STATIC( FUNC ) \
static int FUNC##__Imp( GarrysMod::Lua::ILuaBase* LUA ); \
static int FUNC##__Imp( GMOD_LUACLASS LUA ); \
static int FUNC( lua_State* L ) \
{ \
GarrysMod::Lua::ILuaBase* LUA = L->luabase; \
GMOD_LUACLASS LUA = L->luabase; \
LUA->SetState(L); \
return FUNC##__Imp( LUA ); \
} \
static int FUNC##__Imp( [[maybe_unused]] GarrysMod::Lua::ILuaBase* LUA )
static int FUNC##__Imp( [[maybe_unused]] GMOD_LUACLASS LUA )

#define LUA_FUNCTION_DECLARE( FUNC ) \
int FUNC( lua_State *L )
Expand All @@ -81,25 +87,25 @@ struct lua_State

#define LUA_FUNCTION_IMPLEMENT( FUNC ) \
[[deprecated("Use LUA_FUNCTION_STATIC_MEMBER instead of LUA_FUNCTION_IMPLEMENT.")]] \
static int FUNC##__Imp( [[maybe_unused]] GarrysMod::Lua::ILuaBase* LUA )
static int FUNC##__Imp( [[maybe_unused]] GMOD_LUACLASS LUA )

#define LUA_FUNCTION_WRAP( FUNC ) \
[[deprecated("Use LUA_FUNCTION_STATIC_MEMBER instead of LUA_FUNCTION_WRAP.")]] \
static int FUNC( lua_State *L ) \
{ \
GarrysMod::Lua::ILuaBase* LUA = L->luabase; \
GMOD_LUACLASS LUA = L->luabase; \
LUA->SetState(L); \
return FUNC##__Imp( LUA ); \
}

#define LUA_FUNCTION_STATIC_MEMBER( FUNC ) \
static int FUNC( lua_State* L ) \
{ \
GarrysMod::Lua::ILuaBase* LUA = L->luabase; \
GMOD_LUACLASS LUA = L->luabase; \
LUA->SetState(L); \
return FUNC##__Imp( LUA ); \
} \
static int FUNC##__Imp( GarrysMod::Lua::ILuaBase* LUA )
static int FUNC##__Imp( GMOD_LUACLASS LUA )
#endif
#endif

Expand Down
6 changes: 3 additions & 3 deletions include/GarrysMod/Lua/LuaConVars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ namespace GarrysMod
public:
virtual ~ILuaConVars( ) = 0;
virtual void Init( ) = 0;
virtual ConVar *CreateConVar( const char *, const char *, const char *, int ) = 0;
virtual ConCommand *CreateConCommand( const char *, const char *, int, void ( * )( const CCommand & ), int ( * )( const char *, char ( * )[128] ) ) = 0;
virtual ConVar *CreateConVar( const char* name, const char* defaultValue, const char* helpString, int flags ) = 0;
virtual ConCommand *CreateConCommand( const char* name, const char* helpString, int flags, void ( * )( const CCommand & ) callback, int ( * )( const char *, char ( * )[128] ) completionFunc ) = 0;
virtual void DestroyManaged( ) = 0;
virtual void Cache( const char *, const char * ) = 0;
virtual void Cache( const char* key, const char* value ) = 0;
virtual void ClearCache( ) = 0;
};
}
Expand Down
8 changes: 5 additions & 3 deletions include/GarrysMod/Lua/LuaInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ namespace GarrysMod
virtual bool RunStringEx( const char *filename, const char *path, const char *stringToRun, bool run, bool printErrors, bool dontPushErrors, bool noReturns ) = 0;
virtual size_t GetDataString( int index, const char **str ) = 0;
virtual void ErrorFromLua( const char *fmt, ... ) = 0;
// Returns "<nowhere>" if nothign was found.
virtual const char *GetCurrentLocation( ) = 0;
virtual void MsgColour( const Color &col, const char *fmt, ... ) = 0;
// outStr is set to "!UNKNOWN" if it couldn't be found.
virtual void GetCurrentFile( std::string &outStr ) = 0;
virtual void CompileString( Bootil::Buffer &dumper, const std::string &stringToCompile ) = 0;
virtual bool CallFunctionProtected( int, int, bool ) = 0;
Expand All @@ -101,10 +103,10 @@ namespace GarrysMod
virtual void PreCreateTable( int arrelems, int nonarrelems ) = 0;
virtual void PushPooledString( int index ) = 0;
virtual const char *GetPooledString( int index ) = 0;
virtual int AddThreadedCall( ILuaThreadedCall * ) = 0; // NOTE: Returns the amount off queried threaded calls.
virtual int AddThreadedCall( ILuaThreadedCall* call ) = 0; // NOTE: Returns the number of queried threaded calls.
virtual void AppendStackTrace( char *, unsigned long ) = 0;
virtual void *CreateConVar( const char *, const char *, const char *, int ) = 0;
virtual void *CreateConCommand( const char *, const char *, int, void ( * )( const CCommand & ), int ( * )( const char *, char ( * )[128] ) ) = 0;
virtual ConVar *CreateConVar( const char* name, const char* defaultValue, const char* helpString, int flags ) = 0;
virtual ConCommand *CreateConCommand( const char* name, const char* helpString, int flags, void ( * )( const CCommand & ) callback, int ( * )( const char *, char ( * )[128] ) completionFunc ) = 0;
virtual const char* CheckStringOpt( int iStackPos, const char* def ) = 0;
virtual double CheckNumberOpt( int iStackPos, double def ) = 0;
virtual void RegisterMetaTable( const char* name, ILuaObject* tbl ) = 0;
Expand Down
1 change: 1 addition & 0 deletions include/GarrysMod/Lua/LuaObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ namespace GarrysMod
virtual void SetMemberMatrix( int, VMatrix const * ) = 0;

virtual void SetMemberPhysObject( const char *, IPhysicsObject * ) = 0;
virtual double GetMemberDouble( float, double ) = 0;
};

class CLuaObject : public ILuaObject
Expand Down
47 changes: 33 additions & 14 deletions include/GarrysMod/Lua/LuaShared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,38 +43,57 @@ namespace GarrysMod
};
}

struct File
struct LuaFile
{
~LuaFile();
int time;
#ifdef WIN32
std::string name;
std::string source;
std::string contents;
#else
const char* name;
const char* source;
const char* contents;
#endif
Bootil::AutoBuffer compressed;
#ifndef WIN32
int random = 1; // Unknown thing
#endif
unsigned int timesloadedserver;
unsigned int timesloadedclient;
};

struct LuaFindResult
{
std::string fileName;
bool isFolder;
};

class ILuaShared
{
public:
virtual ~ILuaShared( ) = 0;
virtual void Init( void *( * )( const char *, int * ), bool, CSteamAPIContext *, IGet * ) = 0;
// NOTE: magicBool - could maybe be bIsDedicated? true if its a dedicated server?
virtual void Init( void *( * )( const char *, int * ) interfaceFactory, bool magicBool, CSteamAPIContext* context, IGet* pGet ) = 0;
virtual void Shutdown( ) = 0;
virtual void DumpStats( ) = 0;
virtual ILuaInterface *CreateLuaInterface( unsigned char, bool ) = 0;
virtual void CloseLuaInterface( ILuaInterface * ) = 0;
virtual ILuaInterface *GetLuaInterface( unsigned char ) = 0;
virtual File *LoadFile( const std::string &path, const std::string &pathId, bool fromDatatable, bool fromFile ) = 0;
virtual File *GetCache( const std::string & );
virtual void MountLua( const char * ) = 0;
virtual void MountLuaAdd( const char *, const char * ) = 0;
virtual void UnMountLua( const char * ) = 0;
virtual void SetFileContents( const char *, const char * ) = 0;
virtual void SetLuaFindHook( LuaClientDatatableHook * ) = 0;
virtual void FindScripts( const std::string &, const std::string &, std::vector<std::string> & ) = 0;
virtual ILuaInterface *CreateLuaInterface( unsigned char realm, bool unknown ) = 0;
virtual void CloseLuaInterface( ILuaInterface* luaInterface ) = 0;
virtual ILuaInterface *GetLuaInterface( unsigned char realm ) = 0;
virtual LuaFile *LoadFile( const std::string& path, const std::string& pathId, bool fromDatatable, bool fromFile ) = 0;
virtual LuaFile *GetCache( const std::string& fileName );
virtual void MountLua( const char* pathID ) = 0;
virtual void MountLuaAdd( const char* file, const char* pathID ) = 0;
virtual void UnMountLua( const char* pathID ) = 0;
// Probably: unknown1 = fileName | unknown2 = pathID
virtual void SetFileContents( const char* unknown1, const char* unknown2 ) = 0;
virtual void SetLuaFindHook( LuaClientDatatableHook* hook ) = 0;
virtual void FindScripts( const std::string& path, const std::string& pathID, std::vector<LuaFindResult>& outPut ) = 0;
virtual const char *GetStackTraces( ) = 0;
virtual void InvalidateCache( const std::string & ) = 0;
virtual void InvalidateCache( const std::string& unknown ) = 0;
virtual void EmptyCache( ) = 0;
virtual bool ScriptExists( const std::string& file, const std::string& path, bool idk ) = 0;
};
}
}
Loading