Skip to content

Commit 8798c69

Browse files
AyutoAyuto
committed
2 parents 33ab6a3 + 4558e35 commit 8798c69

File tree

26 files changed

+201
-111
lines changed

26 files changed

+201
-111
lines changed

‎addons/source-python/data/source-python/client/orangebox/CBaseClient.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
[virtual_function]
44
[[set_name]]
55
offset_linux = 57
6-
offset_windows = 18
6+
offset_windows = 17
77
arguments = STRING

‎addons/source-python/data/source-python/entities/orangebox/CBasePlayer.ini

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
[function]
2-
3-
[[increment_frag_count]]
4-
identifier_windows = 55 8B EC 8B 45 08 01 81 38 0E 00 00
5-
identifier_linux = _ZN11CBasePlayer18IncrementFragCountEi
6-
arguments = INT
7-
8-
[[increment_death_count]]
9-
identifier_windows = 55 8B EC 8B 45 08 01 81 3C 0E 00 00
10-
identifier_linux = _ZN11CBasePlayer19IncrementDeathCountEi
11-
arguments = INT
12-
13-
141
[virtual_function]
152

163
# _ZN11CBasePlayer11Weapon_DropEP17CBaseCombatWeaponPK6VectorS4_
@@ -28,3 +15,7 @@
2815
[[post_think]]
2916
offset_linux = 340
3017
offset_windows = 339
18+
19+
# _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
20+
[[run_command]]
21+
arguments = POINTER, POINTER

‎addons/source-python/data/source-python/entities/orangebox/cstrike/CCSPlayer.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
identifier_linux = _ZN9CCSPlayer7AutoBuyEv
1111

1212
[[buy_internal]]
13-
identifier_windows = 55 8B EC 83 EC 28 89 4D F8 6A 00
13+
identifier_windows = 55 8B EC 83 EC 28 89 4D F8 6A 00
1414
identifier_linux = _ZN9CCSPlayer26HandleCommand_Buy_InternalEPKc
1515
arguments = STRING
1616
return_type = INT
@@ -25,7 +25,7 @@
2525
arguments = FLOAT
2626

2727
[[switch_team]]
28-
identifier_windows = 55 8B EC 83 EC 5C 89 4D FC
28+
identifier_windows = 55 8B EC 83 EC 5C 89 4D FC
2929
identifier_linux = _ZN9CCSPlayer10SwitchTeamEi
3030
arguments = INT
3131

‎addons/source-python/data/source-python/entities/orangebox/tf/CBaseCombatCharacter.ini

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
# _ZN20CBaseCombatCharacter18OnTakeDamage_AliveERK15CTakeDamageInfo
44
[[on_take_damage_alive]]
5-
offset_linux = 283
6-
offset_windows = 282
7-
arguments = POINTER
8-
return_type = INT
5+
offset_linux = 284
6+
offset_windows = 283
97

108
# _ZN20CBaseCombatCharacter13Weapon_SwitchEP17CBaseCombatWeaponi
119
[[weapon_switch]]
12-
offset_linux = 275
13-
offset_windows = 274
10+
offset_linux = 276
11+
offset_windows = 275

‎addons/source-python/data/source-python/entities/orangebox/tf/CBaseCombatWeapon.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
# _ZN17CBaseCombatWeapon13PrimaryAttackEv
44
[[primary_attack]]
5-
offset_linux = 292
6-
offset_windows = 291
5+
offset_linux = 293
6+
offset_windows = 287
77

88
# _ZN17CBaseCombatWeapon15SecondaryAttackEv
99
[[secondary_attack]]
10-
offset_linux = 293
11-
offset_windows = 292
10+
offset_linux = 294
11+
offset_windows = 288

‎addons/source-python/data/source-python/entities/orangebox/tf/CBaseEntity.ini

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
[virtual_function]
22

3-
# _ZN11CBaseEntity8TeleportEPK6VectorPK6QAngleS2_
4-
[[teleport]]
5-
offset_linux = 114
6-
offset_windows = 113
7-
arguments = POINTER, POINTER, POINTER
8-
93
# _ZN11CBaseEntity10StartTouchEPS_
104
[[start_touch]]
11-
offset_linux = 104
12-
offset_windows = 103
13-
arguments = POINTER
5+
offset_linux = 105
6+
offset_windows = 104
147

158
# _ZN11CBaseEntity5TouchEPS_
169
[[touch]]
17-
offset_linux = 105
18-
offset_windows = 104
19-
arguments = POINTER
10+
offset_linux = 106
11+
offset_windows = 105
2012

2113
# _ZN11CBaseEntity8EndTouchEPS_
2214
[[end_touch]]
23-
offset_linux = 106
24-
offset_windows = 105
25-
arguments = POINTER
15+
offset_linux = 107
16+
offset_windows = 106
17+
18+
# _ZN11CBaseEntity8TeleportEPK6VectorPK6QAngleS2_
19+
[[teleport]]
20+
offset_linux = 115
21+
offset_windows = 114
2622

2723
# _ZNK11CBasePlayer25PhysicsSolidMaskForEntityEv
2824
[[get_solid_mask]]
29-
offset_linux = 174
30-
offset_windows = 173
31-
return_type = UINT
25+
offset_linux = 175
26+
offset_windows = 174

‎addons/source-python/data/source-python/entities/orangebox/tf/CBasePlayer.ini

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,23 @@
22

33
# _ZN11CBasePlayer11Weapon_DropEP17CBaseCombatWeaponPK6VectorS4_
44
[[drop_weapon]]
5-
offset_linux = 274
6-
offset_windows = 273
7-
arguments = POINTER, POINTER, POINTER
5+
offset_linux = 275
6+
offset_windows = 274
87

98
# _ZN11CBasePlayer8PreThinkEv
109
[[pre_think]]
11-
offset_linux = 344
12-
offset_windows = 343
10+
offset_linux = 345
11+
offset_windows = 344
1312

1413
# _ZN11CBasePlayer9PostThinkEv
1514
[[post_think]]
16-
offset_linux = 345
17-
offset_windows = 344
15+
offset_linux = 346
16+
offset_windows = 345
1817

1918
# _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
2019
[[run_command]]
21-
offset_linux = 431
22-
offset_windows = 430
23-
arguments = POINTER, POINTER
20+
offset_linux = 432
21+
offset_windows = 431
2422

2523

2624
[property]

‎addons/source-python/data/source-python/entities/orangebox/tf/CTFPlayer.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
# _ZN9CTFPlayer10BumpWeaponEP17CBaseCombatWeapon
44
[[bump_weapon]]
5-
offset_linux = 409
6-
offset_windows = 408
5+
offset_linux = 410
6+
offset_windows = 409
77
arguments = POINTER
88
return_type = BOOL
99

‎addons/source-python/data/source-python/entity_output/orangebox/CBaseEntityOutput.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ binary = server
55
[function]
66
[[fire_output]]
77
identifier_linux = _ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f
8-
identifier_windows = 55 8B EC 81 EC 24 01 00 00 53 8B C1
8+
# Reference string: (%0.2f) output: (%s,%s) -> (%s,%s,%.1f)
9+
identifier_windows = 55 8B EC 81 EC 40 01 00 00 8B C1 53
910
arguments_linux = POINTER, POINTER, POINTER, FLOAT
1011
arguments_windows = INT, INT, INT, INT, POINTER, POINTER, POINTER, FLOAT

‎addons/source-python/data/source-python/entity_output/orangebox/cstrike/CBaseEntityOutput.ini

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎addons/source-python/data/source-python/entity_output/orangebox/hl2mp/CBaseEntityOutput.ini

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎addons/source-python/data/source-python/memory/blade/global_pointers.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ identifier_windows = B8 01 00 00 00 84 05 2A 2A 2A 2A 75 2A 09 05 2A 2A 2A 2A B9
88
offset_windows = 20
99
level_windows = 1
1010

11+
# TODO: Remove when outdated.
1112
[CGlobalEntityList]
1213
binary = server
1314
identifier_linux = gEntList
@@ -24,6 +25,7 @@ offset_windows = 8
2425
level_windows = 1
2526
srv_check = False
2627

28+
# TODO: Remove when outdated.
2729
[CBaseTempEntity]
2830
binary = server
2931
srv_check = False

‎addons/source-python/data/source-python/memory/bms/global_pointers.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# ../data/source-python/memory/bms/global_pointers.ini
22

3+
# TODO: Remove when outdated.
34
[CGlobalEntityList]
45
binary = server
56
identifier_linux = gEntList

‎addons/source-python/data/source-python/memory/orangebox/global_pointers.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# ../data/source-python/memory/orangebox/global_pointers.ini
22

3+
# TODO: Remove when outdated.
34
[CGlobalEntityList]
45
binary = server
56
identifier_linux = gEntList

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

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -256,23 +256,6 @@ def setup_exception_hooks():
256256
from hooks.exceptions import except_hooks
257257
from hooks.warnings import warning_hooks
258258

259-
# Temporary workaround for sys.excepthook bug:
260-
# https://bugs.python.org/issue1230540
261-
import sys
262-
import threading
263-
264-
run_old = threading.Thread.run
265-
266-
def run(*args, **kwargs):
267-
try:
268-
run_old(*args, **kwargs)
269-
except (KeyboardInterrupt, SystemExit):
270-
raise
271-
except:
272-
sys.excepthook(*sys.exc_info())
273-
274-
threading.Thread.run = run
275-
276259

277260
# =============================================================================
278261
# >> TRANSLATIONS
@@ -404,31 +387,39 @@ def setup_entities_listener():
404387
"""Set up entities listener."""
405388
_sp_logger.log_debug('Setting up entities listener...')
406389

407-
import sys
408390
from warnings import warn
409391
from _core import _sp_plugin
410-
from memory.manager import manager
411392

412393
try:
413-
manager.get_global_pointer('GlobalEntityList').add_entity_listener(
414-
_sp_plugin
415-
)
416-
except NameError:
417-
warn(str(sys.exc_info()[1]))
394+
from _entities import _global_entity_list
395+
_global_entity_list.add_entity_listener(_sp_plugin)
396+
except ImportError:
397+
try:
398+
from memory.manager import manager
399+
manager.get_global_pointer(
400+
'GlobalEntityList'
401+
).add_entity_listener(_sp_plugin)
402+
except NameError as e:
403+
warn(e)
418404

419405

420406
def remove_entities_listener():
421407
"""Remove entities listener."""
422408
_sp_logger.log_debug('Removing entities listener...')
423409

424410
from _core import _sp_plugin
425-
from memory.manager import manager
426411

427412
try:
428-
manager.get_global_pointer('GlobalEntityList').remove_entity_listener(
429-
_sp_plugin)
430-
except NameError:
431-
pass
413+
from _entities import _global_entity_list
414+
_global_entity_list.remove_entity_listener(_sp_plugin)
415+
except ImportError:
416+
try:
417+
from memory.manager import manager
418+
manager.get_global_pointer(
419+
'GlobalEntityList'
420+
).remove_entity_listener(_sp_plugin)
421+
except NameError:
422+
pass
432423

433424

434425
# =============================================================================

‎addons/source-python/packages/source-python/translations/strings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __init__(self, infile, encoding='utf_8'):
6969

7070
# Get the path to the server specific file
7171
self._serverfile = self._mainfile.parent / '{0}_server.ini'.format(
72-
self._mainfile.name)
72+
self._mainfile.stem)
7373

7474
# Get the strings from the main file
7575
main_strings = GameConfigObj(self._mainfile, encoding=encoding)

‎src/core/modules/effects/blade/effects_base_wrap.h

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,27 @@
2727
#ifndef _EFFECTS_BASE_WRAP_BLADE_H
2828
#define _EFFECTS_BASE_WRAP_BLADE_H
2929

30+
//-----------------------------------------------------------------------------
31+
// Includes.
32+
//-----------------------------------------------------------------------------
33+
#include "game/shared/itempents.h"
34+
#include "toolframework/itoolentity.h"
35+
#include "game/server/basetempentity.h"
36+
37+
38+
//-----------------------------------------------------------------------------
39+
// External variables.
40+
//-----------------------------------------------------------------------------
41+
extern IServerTools *servertools;
42+
43+
3044
//-----------------------------------------------------------------------------
3145
// Exports CBaseTempEntity.
3246
//-----------------------------------------------------------------------------
3347
template<class T, class U>
3448
void export_engine_specific_temp_entity(T _base, U TempEntity)
3549
{
36-
// Nothing specific to Blade...
50+
_base.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));
3751
}
3852

3953

‎src/core/modules/effects/orangebox/effects_base_wrap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ extern IServerTools *servertools;
4545
// Exports CBaseTempEntity.
4646
//-----------------------------------------------------------------------------
4747
template<class T, class U>
48-
void export_engine_specific_temp_entity(T _effects, U TempEntity)
48+
void export_engine_specific_temp_entity(T _base, U TempEntity)
4949
{
50-
_effects.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));
50+
_base.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));
5151
}
5252

5353

‎src/core/modules/entities/blade/entities_wrap.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,18 @@
3030
//-----------------------------------------------------------------------------
3131
// Includes.
3232
//-----------------------------------------------------------------------------
33+
// Source.Python
3334
#include "entities.h"
3435

36+
// SDK
37+
#include "toolframework/itoolentity.h"
38+
39+
40+
//-----------------------------------------------------------------------------
41+
// External variables.
42+
//-----------------------------------------------------------------------------
43+
extern IServerTools *servertools;
44+
3545

3646
//-----------------------------------------------------------------------------
3747
// Exports CTakeDamageInfo.
@@ -43,4 +53,17 @@ void export_engine_specific_take_damage_info(T _entities, U TakeDamageInfo)
4353
}
4454

4555

56+
57+
58+
//-----------------------------------------------------------------------------
59+
// Exports CGlobalEntityList.
60+
//-----------------------------------------------------------------------------
61+
template<class T, class U>
62+
void export_engine_specific_global_entity_list(T _entities, U GlobalEntityList)
63+
{
64+
// Singleton...
65+
_entities.attr("_global_entity_list") = object(ptr(servertools->GetEntityList()));
66+
}
67+
68+
4669
#endif // _ENTITIES_WRAP_BLADE_H

0 commit comments

Comments
 (0)