Skip to content

Commit c7b6615

Browse files
author
invincibleqc
committed
Fixed ServerCommandDispatcher's inheritance.
Added cvar.get_commands.
1 parent 51a8510 commit c7b6615

File tree

4 files changed

+103
-101
lines changed

4 files changed

+103
-101
lines changed

‎addons/source-python/packages/source-python/commands/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
# Commands
1818
from _commands import Command
1919
from _commands import CommandReturn
20+
from _commands import ConCommandBase
2021

2122

2223
# =============================================================================
2324
# >> ALL DECLARATION
2425
# =============================================================================
2526
__all__ = ('Command',
2627
'CommandReturn',
28+
'ConCommandBase',
2729
)
2830

2931

‎addons/source-python/packages/source-python/cvars/__init__.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
# Source.Python Imports
1818
# Cvars
1919
from _cvars import cvar
20-
from _cvars import ConCommandBase
2120

2221

2322
# =============================================================================
2423
# >> ALL DECLARATION
2524
# =============================================================================
26-
__all__ = ('ConCommandBase',
27-
'ConVar',
25+
__all__ = ('ConVar',
2826
'cvar',
2927
)
3028

‎src/core/modules/commands/commands_wrap_python.cpp‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,15 @@ void ClearAllCommands()
8383
// Exposes the command module.
8484
//-----------------------------------------------------------------------------
8585
void export_command();
86+
void export_concommandbase();
8687
void export_server_command();
8788
void export_client_command();
8889
void export_say_command();
8990

9091
DECLARE_SP_MODULE(_commands)
9192
{
9293
export_command();
94+
export_concommandbase();
9395
export_server_command();
9496
export_client_command();
9597
export_say_command();
@@ -154,14 +156,77 @@ void export_command()
154156
;
155157
}
156158

159+
void export_concommandbase()
160+
{
161+
class_<ConCommandBase>("ConCommandBase")
162+
.def(init< const char*, optional< const char*, int> >())
163+
164+
.def("is_command",
165+
&ConCommandBase::IsCommand,
166+
"Returns whether it's a command."
167+
)
168+
169+
.def("is_flag_set",
170+
&ConCommandBase::IsFlagSet,
171+
"Returns whether the given flag is set or not.",
172+
args("flag")
173+
)
174+
175+
.def("add_flags",
176+
&ConCommandBase::AddFlags,
177+
"Adds the given flags to the ConVar.",
178+
args("flag")
179+
)
180+
181+
.def("remove_flags",
182+
&ConCommandBase::RemoveFlags,
183+
"Removes the given flags from the ConVar.",
184+
args("flag")
185+
)
186+
187+
.def("get_flags",
188+
&ConCommandBase::GetFlags,
189+
"Returns its flags."
190+
)
191+
192+
.def("get_name",
193+
&ConCommandBase::GetName,
194+
"Returns its name."
195+
)
196+
197+
.def("get_help_text",
198+
&ConCommandBase::GetHelpText,
199+
"Returns the help text."
200+
)
201+
202+
.def("get_next",
203+
GET_METHOD(ConCommandBase*, ConCommandBase, GetNext),
204+
"Returns the next ConCommandBase instance.",
205+
reference_existing_object_policy()
206+
)
207+
208+
.def("is_registered",
209+
&ConCommandBase::IsRegistered,
210+
"Returns wheter the ConCommandBase instance is registered."
211+
)
212+
213+
.def("get_dll_identifier",
214+
&ConCommandBase::GetDLLIdentifier,
215+
"Returns the DLL identifier."
216+
)
217+
218+
ADD_MEM_TOOLS(ConCommandBase, "ConCommandBase")
219+
;
220+
}
221+
157222
//-----------------------------------------------------------------------------
158223
// Exposes the Server Command interface.
159224
//-----------------------------------------------------------------------------
160225
BOOST_PYTHON_FUNCTION_OVERLOADS( get_server_command_overloads, GetServerCommand, 1, 3)
161226

162227
void export_server_command()
163228
{
164-
class_<CServerCommandManager, boost::noncopyable>("ServerCommandDispatcher", no_init)
229+
class_<CServerCommandManager, bases<ConCommandBase>, boost::noncopyable>("ServerCommandDispatcher", no_init)
165230
.def("add_callback",
166231
&CServerCommandManager::AddCallback,
167232
"Adds a callback to the server command's list.",

‎src/core/modules/cvars/cvars_wrap_python.cpp‎

Lines changed: 34 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,12 @@ extern ICvar* g_pCVar;
4343
// Exposes the cvar module.
4444
//-----------------------------------------------------------------------------
4545
void export_cvar_interface();
46-
void export_concommandbase();
4746
void export_convar();
4847
void export_flags();
4948

5049
DECLARE_SP_MODULE(_cvars)
5150
{
5251
export_cvar_interface();
53-
export_concommandbase();
5452
export_convar();
5553
export_flags();
5654
}
@@ -93,106 +91,16 @@ void export_cvar_interface()
9391
args("cvar", "old_string", "old_float")
9492
)
9593

96-
ADD_MEM_TOOLS(ICvar, "_Cvar")
97-
;
98-
99-
scope().attr("cvar") = object(ptr(g_pCVar));
100-
}
101-
102-
//-----------------------------------------------------------------------------
103-
// Exposes the ConCommandBase interface.
104-
//-----------------------------------------------------------------------------
105-
void export_concommandbase()
106-
{
107-
class_<ConCommandBase>("ConCommandBase")
108-
.def(init< const char*, optional< const char*, int> >())
109-
110-
.def("is_command",
111-
&ConCommandBase::IsCommand,
112-
"Returns whether it's a command."
113-
)
114-
115-
.def("is_flag_set",
116-
&ConCommandBase::IsFlagSet,
117-
"Returns whether the given flag is set or not.",
118-
args("flag")
119-
)
120-
121-
.def("add_flags",
122-
&ConCommandBase::AddFlags,
123-
"Adds the given flags to the ConVar.",
124-
args("flag")
125-
)
126-
127-
.def("remove_flags",
128-
&ConCommandBase::RemoveFlags,
129-
"Removes the given flags from the ConVar.",
130-
args("flag")
131-
)
132-
133-
.def("get_flags",
134-
&ConCommandBase::GetFlags,
135-
"Returns its flags."
136-
)
137-
138-
.def("get_name",
139-
&ConCommandBase::GetName,
140-
"Returns its name."
141-
)
142-
143-
.def("get_help_text",
144-
&ConCommandBase::GetHelpText,
145-
"Returns the help text."
146-
)
147-
148-
.def("get_next",
149-
GET_METHOD(ConCommandBase*, ConCommandBase, GetNext),
150-
"Returns the next ConCommandBase instance.",
94+
.def("get_commands",
95+
GET_METHOD(ConCommandBase *, ICvar, GetCommands),
96+
"Get first ConCommandBase to allow iteration.",
15197
reference_existing_object_policy()
15298
)
15399

154-
.def("is_registered",
155-
&ConCommandBase::IsRegistered,
156-
"Returns wheter the ConCommandBase instance is registered."
157-
)
158-
159-
.def("get_dll_identifier",
160-
&ConCommandBase::GetDLLIdentifier,
161-
"Returns the DLL identifier."
162-
)
163-
164-
ADD_MEM_TOOLS(ConCommandBase, "ConCommandBase")
100+
ADD_MEM_TOOLS(ICvar, "_Cvar")
165101
;
166102

167-
// TODO: Rename or move to ConVar
168-
class_<IConVar, boost::noncopyable>("_IConVar", no_init)
169-
.def("set_string",
170-
GET_METHOD(void, IConVar, SetValue, const char*),
171-
args("value")
172-
)
173-
174-
.def("set_float",
175-
GET_METHOD(void, IConVar, SetValue, float),
176-
args("value")
177-
)
178-
179-
.def("set_int",
180-
GET_METHOD(void, IConVar, SetValue, int),
181-
args("value")
182-
)
183-
184-
.def("get_name",
185-
&IConVar::GetName,
186-
"Returns its name."
187-
)
188-
189-
.def("is_flag_set",
190-
&IConVar::IsFlagSet,
191-
"Returns whether the given flag is set."
192-
)
193-
194-
ADD_MEM_TOOLS(IConVar, "_IConVar")
195-
;
103+
scope().attr("cvar") = object(ptr(g_pCVar));
196104
}
197105

198106
//-----------------------------------------------------------------------------
@@ -252,6 +160,35 @@ class ConVarExt
252160

253161
void export_convar()
254162
{
163+
class_<IConVar, boost::noncopyable>("_IConVar", no_init)
164+
.def("set_string",
165+
GET_METHOD(void, IConVar, SetValue, const char*),
166+
args("value")
167+
)
168+
169+
.def("set_float",
170+
GET_METHOD(void, IConVar, SetValue, float),
171+
args("value")
172+
)
173+
174+
.def("set_int",
175+
GET_METHOD(void, IConVar, SetValue, int),
176+
args("value")
177+
)
178+
179+
.def("get_name",
180+
&IConVar::GetName,
181+
"Returns its name."
182+
)
183+
184+
.def("is_flag_set",
185+
&IConVar::IsFlagSet,
186+
"Returns whether the given flag is set."
187+
)
188+
189+
ADD_MEM_TOOLS(IConVar, "_IConVar")
190+
;
191+
255192
class_<ConVar, boost::shared_ptr<ConVar>, bases<ConCommandBase, IConVar>, boost::noncopyable>("_ConVar", no_init)
256193
// We have to overload __init__. Otherwise we would get an error because of "no_init"
257194
.def("__init__",

0 commit comments

Comments
 (0)