Skip to content

Commit 6beaadf

Browse files
committed
Changed ClientFullyConnect and OnEdictAllocated listeners to provide the index on the entity instead of the edict.
Changed on_edict_free_listener_manager to on_edict_freed_listener_manager to match the name of the listener.
1 parent 606e8c9 commit 6beaadf

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Diff for: addons/source-python/packages/source-python/listeners/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from _listeners import level_shutdown_listener_manager
2828
from _listeners import network_id_validated_listener_manager
2929
from _listeners import on_edict_allocated_listener_manager
30-
from _listeners import on_edict_free_listener_manager
30+
from _listeners import on_edict_freed_listener_manager
3131
from _listeners import on_query_cvar_value_finished_listener_manager
3232
from _listeners import server_activate_listener_manager
3333
from _listeners import tick_listener_manager
@@ -60,7 +60,7 @@
6060
'level_shutdown_listener_manager',
6161
'network_id_validated_listener_manager',
6262
'on_edict_allocated_listener_manager',
63-
'on_edict_free_listener_manager',
63+
'on_edict_freed_listener_manager',
6464
'on_query_cvar_value_finished_listener_manager',
6565
'server_activate_listener_manager',
6666
'tick_listener_manager',
@@ -202,7 +202,7 @@ class OnEdictFreed(_ListenerManager):
202202

203203
"""Register/unregister an OnEdictFreed listener."""
204204

205-
manager = on_edict_free_listener_manager
205+
manager = on_edict_freed_listener_manager
206206

207207

208208
class OnQueryCvarValueFinished(_ListenerManager):

Diff for: src/core/addons/sp_addon.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ void CAddonManager::OnQueryCvarValueFinished( QueryCvarCookie_t iCookie,
164164
#ifdef ENGINE_CSGO
165165
void CAddonManager::ClientFullyConnect( edict_t *pEntity )
166166
{
167-
CALL_LISTENERS(ClientFullyConnect, pEntity);
167+
CALL_LISTENERS(ClientFullyConnect, IndexFromEdict(pEntity));
168168
}
169169

170170
void CAddonManager::OnEdictAllocated( edict_t *edict )
171171
{
172-
CALL_LISTENERS(OnEdictAllocated, edict);
172+
CALL_LISTENERS(OnEdictAllocated, IndexFromEdict(edict));
173173
}
174174

175175
void CAddonManager::OnEdictFreed( const edict_t *edict )

Diff for: src/core/modules/listeners/listeners_wrap_python.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void export_listener_managers()
9898
scope().attr("network_id_validated_listener_manager") = object(ptr(GetNetworkidValidatedListenerManager()));
9999

100100
scope().attr("on_edict_allocated_listener_manager") = object(ptr(GetOnEdictAllocatedListenerManager()));
101-
scope().attr("on_edict_free_listener_manager") = object(ptr(GetOnEdictFreedListenerManager()));
101+
scope().attr("on_edict_freed_listener_manager") = object(ptr(GetOnEdictFreedListenerManager()));
102102

103103
scope().attr("on_query_cvar_value_finished_listener_manager") = object(ptr(GetOnQueryCvarValueFinishedListenerManager()));
104104

0 commit comments

Comments
 (0)