Skip to content

Commit 7081f4e

Browse files
committedJul 30, 2015
Exposed IClient, INetChannel, INetChannelHandler and INetMessage
Move INetChannelInfo to the new _net_channel module
1 parent dcc106b commit 7081f4e

File tree

5 files changed

+390
-38
lines changed

5 files changed

+390
-38
lines changed
 

‎src/CMakeLists.txt

+15
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,16 @@ Set(SOURCEPYTHON_MESSAGES_MODULE_GAME_SOURCES
318318
core/modules/messages/${SOURCE_ENGINE}/messages_implementation.cpp
319319
)
320320

321+
# ------------------------------------------------------------------
322+
# NetChannel module.
323+
# ------------------------------------------------------------------
324+
Set(SOURCEPYTHON_NET_CHANNEL_MODULE_HEADERS
325+
)
326+
327+
Set(SOURCEPYTHON_NET_CHANNEL_MODULE_SOURCES
328+
core/modules/net_channel/net_channel_wrap.cpp
329+
)
330+
321331
# ------------------------------------------------------------------
322332
# Players module
323333
# ------------------------------------------------------------------
@@ -437,6 +447,9 @@ Set(SOURCEPYTHON_MODULE_FILES
437447
${SOURCEPYTHON_MESSAGES_MODULE_SOURCES}
438448
${SOURCEPYTHON_MESSAGES_MODULE_GAME_SOURCES}
439449

450+
${SOURCEPYTHON_NET_CHANNEL_MODULE_HEADERS}
451+
${SOURCEPYTHON_NET_CHANNEL_MODULE_SOURCES}
452+
440453
${SOURCEPYTHON_PLAYERS_MODULE_HEADERS}
441454
${SOURCEPYTHON_PLAYERS_MODULE_SOURCES}
442455

@@ -479,6 +492,7 @@ Source_Group("Header Files\\Modules\\Listeners" FILES ${SOURCEPYTHO
479492
Source_Group("Header Files\\Modules\\Mathlib" FILES ${SOURCEPYTHON_MATHLIB_MODULE_HEADERS})
480493
Source_Group("Header Files\\Modules\\Memory" FILES ${SOURCEPYTHON_MEMORY_MODULE_HEADERS})
481494
Source_Group("Header Files\\Modules\\Messages" FILES ${SOURCEPYTHON_MESSAGES_MODULE_HEADERS})
495+
Source_Group("Header Files\\Modules\\NetChannel" FILES ${SOURCEPYTHON_NET_CHANNEL_MODULE_HEADERS})
482496
Source_Group("Header Files\\Modules\\Players" FILES ${SOURCEPYTHON_PLAYERS_MODULE_HEADERS})
483497
Source_Group("Header Files\\Modules\\Filters" FILES ${SOURCEPYTHON_FILTERS_MODULE_HEADERS})
484498
Source_Group("Header Files\\Modules\\StringTables" FILES ${SOURCEPYTHON_STRINGTABLES_MODULE_HEADERS})
@@ -506,6 +520,7 @@ Source_Group("Source Files\\Modules\\Mathlib" FILES ${SOURCEPYTHO
506520
Source_Group("Source Files\\Modules\\Memory" FILES ${SOURCEPYTHON_MEMORY_MODULE_SOURCES})
507521
Source_Group("Source Files\\Modules\\Messages" FILES ${SOURCEPYTHON_MESSAGES_MODULE_SOURCES})
508522
Source_Group("Source Files\\Modules\\Messages\\${BRANCH}" FILES ${SOURCEPYTHON_MESSAGES_MODULE_GAME_SOURCES})
523+
Source_Group("Source Files\\Modules\\NetChannel" FILES ${SOURCEPYTHON_NET_CHANNEL_MODULE_SOURCES})
509524
Source_Group("Source Files\\Modules\\Players" FILES ${SOURCEPYTHON_PLAYERS_MODULE_SOURCES})
510525
Source_Group("Source Files\\Modules\\Filters" FILES ${SOURCEPYTHON_FILTERS_MODULE_SOURCES})
511526
Source_Group("Source Files\\Modules\\Steam" FILES ${SOURCEPYTHON_STEAM_MODULE_SOURCES})

‎src/core/modules/engines/engines.h

-13
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,4 @@ class Ray_tExt
169169
};
170170

171171

172-
//-----------------------------------------------------------------------------
173-
// IServer extension class.
174-
//-----------------------------------------------------------------------------
175-
class IServerExt
176-
{
177-
public:
178-
static void* GetClient(IServer* pServer, int iIndex)
179-
{
180-
return (void *) pServer->GetClient(iIndex);
181-
}
182-
};
183-
184-
185172
#endif // _ENGINES_H

‎src/core/modules/engines/engines_wrap.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
#include "public/worldsize.h"
5353
#include "engines.h"
5454
#include "iserver.h"
55+
#include "iclient.h"
5556

5657
#include ENGINE_INCLUDE_PATH(engines_wrap.h)
5758

@@ -1312,9 +1313,9 @@ void export_iserver(scope _engines)
13121313

13131314
_IServer.def(
13141315
"get_client",
1315-
&IServerExt::GetClient,
1316+
&IServer::GetClient,
13161317
"Return the interface to a client.",
1317-
return_by_value_policy()
1318+
reference_existing_object_policy()
13181319
);
13191320

13201321
_IServer.def(

0 commit comments

Comments
 (0)