Skip to content

Commit d4f0b43

Browse files
author
L'In20Cible
committed
- Current scope is now passed to all export functions.
1 parent 66f1320 commit d4f0b43

25 files changed

+362
-362
lines changed

‎src/core/modules/bitbuffers/bitbuffers_wrap_python.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,24 @@
3636
//-----------------------------------------------------------------------------
3737
// Forward declarations.
3838
//-----------------------------------------------------------------------------
39-
void export_bf_write();
40-
void export_bf_read();
39+
void export_bf_write(scope);
40+
void export_bf_read(scope);
4141

4242

4343
//-----------------------------------------------------------------------------
4444
// Declare the _bitbuffers module.
4545
//-----------------------------------------------------------------------------
4646
DECLARE_SP_MODULE(_bitbuffers)
4747
{
48-
export_bf_write();
49-
export_bf_read();
48+
export_bf_write(_bitbuffers);
49+
export_bf_read(_bitbuffers);
5050
}
5151

5252

5353
//-----------------------------------------------------------------------------
5454
// Expose bf_write.
5555
//-----------------------------------------------------------------------------
56-
void export_bf_write()
56+
void export_bf_write(scope _bitbuffers)
5757
{
5858
class_<bf_write>("BitBufferWrite", no_init)
5959
.def("__init__",
@@ -218,7 +218,7 @@ void export_bf_write()
218218
//-----------------------------------------------------------------------------
219219
// Expose bf_read.
220220
//-----------------------------------------------------------------------------
221-
void export_bf_read()
221+
void export_bf_read(scope _bitbuffers)
222222
{
223223
class_<bf_read>("BitBufferRead", no_init)
224224
.def("__init__",

‎src/core/modules/colors/colors_wrap_python.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,22 @@
3737
//-----------------------------------------------------------------------------
3838
// Forward declarations.
3939
//-----------------------------------------------------------------------------
40-
void export_color();
40+
void export_color(scope);
4141

4242

4343
//-----------------------------------------------------------------------------
4444
// Declare the _colors module.
4545
//-----------------------------------------------------------------------------
4646
DECLARE_SP_MODULE(_colors)
4747
{
48-
export_color();
48+
export_color(_colors);
4949
}
5050

5151

5252
//-----------------------------------------------------------------------------
5353
// Expose Color.
5454
//-----------------------------------------------------------------------------
55-
void export_color()
55+
void export_color(scope _colors)
5656
{
5757
class_<Color, Color *> Color_(
5858
"Color",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ extern void UnregisterClientCommandFilter(PyObject* pCallable);
4545
//-----------------------------------------------------------------------------
4646
// Forward declarations.
4747
//-----------------------------------------------------------------------------
48-
void export_client_command_manager();
48+
void export_client_command_manager(scope);
4949

5050

5151
//-----------------------------------------------------------------------------
5252
// Declare the _commands._client module.
5353
//-----------------------------------------------------------------------------
5454
DECLARE_SP_SUBMODULE(_commands, _client)
5555
{
56-
export_client_command_manager();
56+
export_client_command_manager(_client);
5757

5858
// Helper functions...
5959
def("get_client_command",
@@ -80,7 +80,7 @@ DECLARE_SP_SUBMODULE(_commands, _client)
8080
//-----------------------------------------------------------------------------
8181
// Expose CClientCommandManager.
8282
//-----------------------------------------------------------------------------
83-
void export_client_command_manager()
83+
void export_client_command_manager(scope _client)
8484
{
8585
class_<CClientCommandManager, boost::noncopyable>("ClientCommandDispatcher", no_init)
8686
.def("add_callback",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ extern void UnregisterSayFilter(PyObject* pCallable);
4545
//-----------------------------------------------------------------------------
4646
// Forward declarations.
4747
//-----------------------------------------------------------------------------
48-
void export_say_command_manager();
48+
void export_say_command_manager(scope);
4949

5050

5151
//-----------------------------------------------------------------------------
5252
// Declare the _commands._say module.
5353
//-----------------------------------------------------------------------------
5454
DECLARE_SP_SUBMODULE(_commands, _say)
5555
{
56-
export_say_command_manager();
56+
export_say_command_manager(_say);
5757

5858
// Helper functions...
5959
def("get_say_command",
@@ -80,7 +80,7 @@ DECLARE_SP_SUBMODULE(_commands, _say)
8080
//-----------------------------------------------------------------------------
8181
// Expose CSayCommandManager.
8282
//-----------------------------------------------------------------------------
83-
void export_say_command_manager()
83+
void export_say_command_manager(scope _say)
8484
{
8585
class_<CSayCommandManager, boost::noncopyable>("SayCommandDispatcher", no_init)
8686
.def("add_callback",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extern CServerCommandManager* GetServerCommand(const char* szName,
4343
//-----------------------------------------------------------------------------
4444
// Forward declarations.
4545
//-----------------------------------------------------------------------------
46-
void export_server_command_manager();
46+
void export_server_command_manager(scope);
4747

4848

4949
//-----------------------------------------------------------------------------
@@ -57,7 +57,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS(get_server_command_overloads, GetServerCommand,
5757
//-----------------------------------------------------------------------------
5858
DECLARE_SP_SUBMODULE(_commands, _server)
5959
{
60-
export_server_command_manager();
60+
export_server_command_manager(_server);
6161

6262
// Helper functions...
6363
def("get_server_command",
@@ -72,7 +72,7 @@ DECLARE_SP_SUBMODULE(_commands, _server)
7272
//-----------------------------------------------------------------------------
7373
// Expose CServerCommandManager.
7474
//-----------------------------------------------------------------------------
75-
void export_server_command_manager()
75+
void export_server_command_manager(scope _server)
7676
{
7777
class_<CServerCommandManager, bases<ConCommandBase>, boost::noncopyable>("ServerCommandDispatcher", no_init)
7878
.def("add_callback",

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,26 @@ void ClearAllCommands()
7474
//-----------------------------------------------------------------------------
7575
// Forward declarations.
7676
//-----------------------------------------------------------------------------
77-
void export_command();
78-
void export_command_return();
79-
void export_concommandbase();
77+
void export_command(scope);
78+
void export_command_return(scope);
79+
void export_concommandbase(scope);
8080

8181

8282
//-----------------------------------------------------------------------------
8383
// Declare the _commands module.
8484
//-----------------------------------------------------------------------------
8585
DECLARE_SP_MODULE(_commands)
8686
{
87-
export_command();
88-
export_command_return();
89-
export_concommandbase();
87+
export_command(_commands);
88+
export_command_return(_commands);
89+
export_concommandbase(_commands);
9090
}
9191

9292

9393
//-----------------------------------------------------------------------------
9494
// Expose CCommand.
9595
//-----------------------------------------------------------------------------
96-
void export_command()
96+
void export_command(scope _commands)
9797
{
9898
class_<CCommand>("Command")
9999
.def("get_arg_count",
@@ -136,7 +136,7 @@ void export_command()
136136
//-----------------------------------------------------------------------------
137137
// Expose CommandReturn.
138138
//-----------------------------------------------------------------------------
139-
void export_command_return()
139+
void export_command_return(scope _commands)
140140
{
141141
enum_<CommandReturn>("CommandReturn")
142142
.value("CONTINUE", CONTINUE)
@@ -148,7 +148,7 @@ void export_command_return()
148148
//-----------------------------------------------------------------------------
149149
// Expose ConCommandBase.
150150
//-----------------------------------------------------------------------------
151-
void export_concommandbase()
151+
void export_concommandbase(scope _commands)
152152
{
153153
class_<ConCommandBase>("ConCommandBase")
154154
.def(init< const char*, optional< const char*, int> >())

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@ extern ICvar* g_pCVar;
4444
//-----------------------------------------------------------------------------
4545
// Exposes the cvar module.
4646
//-----------------------------------------------------------------------------
47-
void export_cvar_interface();
48-
void export_convar();
49-
void export_flags();
47+
void export_cvar_interface(scope);
48+
void export_convar(scope);
49+
void export_flags(scope);
5050

5151
DECLARE_SP_MODULE(_cvars)
5252
{
53-
export_cvar_interface();
54-
export_convar();
55-
export_flags();
53+
export_cvar_interface(_cvars);
54+
export_convar(_cvars);
55+
export_flags(_cvars);
5656
}
5757

5858
//-----------------------------------------------------------------------------
5959
// Exposes the Cvar interface.
6060
//-----------------------------------------------------------------------------
61-
void export_cvar_interface()
61+
void export_cvar_interface(scope _cvars)
6262
{
6363
class_<ICvar, boost::noncopyable>("_Cvar", no_init)
6464
.def("register_con_command",
@@ -102,7 +102,7 @@ void export_cvar_interface()
102102
ADD_MEM_TOOLS(ICvar, "_Cvar")
103103
;
104104

105-
scope().attr("cvar") = object(ptr(g_pCVar));
105+
_cvars.attr("cvar") = object(ptr(g_pCVar));
106106
}
107107

108108
//-----------------------------------------------------------------------------
@@ -160,7 +160,7 @@ class ConVarExt
160160
}
161161
};
162162

163-
void export_convar()
163+
void export_convar(scope _cvars)
164164
{
165165
class_<IConVar, boost::noncopyable>("_IConVar", no_init)
166166
.def("set_string",
@@ -262,29 +262,29 @@ void export_convar()
262262
;
263263
}
264264

265-
void export_flags()
265+
void export_flags(scope _cvars)
266266
{
267-
scope().attr("FCVAR_NONE") = FCVAR_NONE;
268-
scope().attr("FCVAR_UNREGISTERED") = FCVAR_UNREGISTERED;
269-
scope().attr("FCVAR_DEVELOPMENTONLY") = FCVAR_DEVELOPMENTONLY;
270-
scope().attr("FCVAR_GAMEDLL") = FCVAR_GAMEDLL;
271-
scope().attr("FCVAR_CLIENTDLL") = FCVAR_CLIENTDLL;
272-
scope().attr("FCVAR_HIDDEN") = FCVAR_HIDDEN;
273-
scope().attr("FCVAR_PROTECTED") = FCVAR_PROTECTED;
274-
scope().attr("FCVAR_SPONLY") = FCVAR_SPONLY;
275-
scope().attr("FCVAR_ARCHIVE") = FCVAR_ARCHIVE;
276-
scope().attr("FCVAR_NOTIFY") = FCVAR_NOTIFY;
277-
scope().attr("FCVAR_USERINFO") = FCVAR_USERINFO;
278-
scope().attr("FCVAR_PRINTABLEONLY") = FCVAR_PRINTABLEONLY;
279-
scope().attr("FCVAR_UNLOGGED") = FCVAR_UNLOGGED;
280-
scope().attr("FCVAR_NEVER_AS_STRING") = FCVAR_NEVER_AS_STRING;
281-
scope().attr("FCVAR_REPLICATED") = FCVAR_REPLICATED;
282-
scope().attr("FCVAR_CHEAT") = FCVAR_CHEAT;
283-
scope().attr("FCVAR_DEMO") = FCVAR_DEMO;
284-
scope().attr("FCVAR_DONTRECORD") = FCVAR_DONTRECORD;
285-
scope().attr("FCVAR_NOT_CONNECTED") = FCVAR_NOT_CONNECTED;
286-
scope().attr("FCVAR_ARCHIVE_XBOX") = FCVAR_ARCHIVE_XBOX;
287-
scope().attr("FCVAR_SERVER_CAN_EXECUTE") = FCVAR_SERVER_CAN_EXECUTE;
288-
scope().attr("FCVAR_SERVER_CANNOT_QUERY") = FCVAR_SERVER_CANNOT_QUERY;
289-
scope().attr("FCVAR_CLIENTCMD_CAN_EXECUTE") = FCVAR_CLIENTCMD_CAN_EXECUTE;
267+
_cvars.attr("FCVAR_NONE") = FCVAR_NONE;
268+
_cvars.attr("FCVAR_UNREGISTERED") = FCVAR_UNREGISTERED;
269+
_cvars.attr("FCVAR_DEVELOPMENTONLY") = FCVAR_DEVELOPMENTONLY;
270+
_cvars.attr("FCVAR_GAMEDLL") = FCVAR_GAMEDLL;
271+
_cvars.attr("FCVAR_CLIENTDLL") = FCVAR_CLIENTDLL;
272+
_cvars.attr("FCVAR_HIDDEN") = FCVAR_HIDDEN;
273+
_cvars.attr("FCVAR_PROTECTED") = FCVAR_PROTECTED;
274+
_cvars.attr("FCVAR_SPONLY") = FCVAR_SPONLY;
275+
_cvars.attr("FCVAR_ARCHIVE") = FCVAR_ARCHIVE;
276+
_cvars.attr("FCVAR_NOTIFY") = FCVAR_NOTIFY;
277+
_cvars.attr("FCVAR_USERINFO") = FCVAR_USERINFO;
278+
_cvars.attr("FCVAR_PRINTABLEONLY") = FCVAR_PRINTABLEONLY;
279+
_cvars.attr("FCVAR_UNLOGGED") = FCVAR_UNLOGGED;
280+
_cvars.attr("FCVAR_NEVER_AS_STRING") = FCVAR_NEVER_AS_STRING;
281+
_cvars.attr("FCVAR_REPLICATED") = FCVAR_REPLICATED;
282+
_cvars.attr("FCVAR_CHEAT") = FCVAR_CHEAT;
283+
_cvars.attr("FCVAR_DEMO") = FCVAR_DEMO;
284+
_cvars.attr("FCVAR_DONTRECORD") = FCVAR_DONTRECORD;
285+
_cvars.attr("FCVAR_NOT_CONNECTED") = FCVAR_NOT_CONNECTED;
286+
_cvars.attr("FCVAR_ARCHIVE_XBOX") = FCVAR_ARCHIVE_XBOX;
287+
_cvars.attr("FCVAR_SERVER_CAN_EXECUTE") = FCVAR_SERVER_CAN_EXECUTE;
288+
_cvars.attr("FCVAR_SERVER_CANNOT_QUERY") = FCVAR_SERVER_CANNOT_QUERY;
289+
_cvars.attr("FCVAR_CLIENTCMD_CAN_EXECUTE") = FCVAR_CLIENTCMD_CAN_EXECUTE;
290290
}

‎src/core/modules/effects/effects_wrap_python.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ IPredictionSystem* IPredictionSystem::g_pPredictionSystems = NULL;
5555
//-----------------------------------------------------------------------------
5656
// Exposes the effects_c module.
5757
//-----------------------------------------------------------------------------
58-
void export_prediction_system();
59-
void export_temp_entities_system();
60-
void export_dispatch_effect_data();
58+
void export_prediction_system(scope);
59+
void export_temp_entities_system(scope);
60+
void export_dispatch_effect_data(scope);
6161

6262
DECLARE_SP_MODULE(_effects)
6363
{
64-
export_prediction_system();
65-
export_temp_entities_system();
66-
export_dispatch_effect_data();
64+
export_prediction_system(_effects);
65+
export_temp_entities_system(_effects);
66+
export_dispatch_effect_data(_effects);
6767

6868
enum_<ShatterSurface_t>("ShatterSurface")
6969
.value("GLASS", SHATTERSURFACE_GLASS)
@@ -75,7 +75,7 @@ DECLARE_SP_MODULE(_effects)
7575
//-----------------------------------------------------------------------------
7676
// Expose IPredictionSystem
7777
//-----------------------------------------------------------------------------
78-
void export_prediction_system()
78+
void export_prediction_system(scope _effects)
7979
{
8080
class_<IPredictionSystem>("PredictionSystem")
8181
.def("get_next",
@@ -111,7 +111,7 @@ void export_prediction_system()
111111
//-----------------------------------------------------------------------------
112112
// Expose ITempEntsSystem.
113113
//-----------------------------------------------------------------------------
114-
void export_temp_entities_system()
114+
void export_temp_entities_system(scope _effects)
115115
{
116116
class_<ITempEntsSystem, bases<IPredictionSystem>, boost::noncopyable> TempEntities("_TempEntities", no_init);
117117

@@ -172,7 +172,7 @@ void export_temp_entities_system()
172172
//-----------------------------------------------------------------------------
173173
// Expose CEffectData.
174174
//-----------------------------------------------------------------------------
175-
void export_dispatch_effect_data()
175+
void export_dispatch_effect_data(scope _effects)
176176
{
177177
class_<CEffectData> DispatchEffectData("DispatchEffectData");
178178

0 commit comments

Comments
 (0)