Skip to content

Commit

Permalink
Removed temp_entities
Browse files Browse the repository at this point in the history
Moved effects.constants to effects
  • Loading branch information
Ayuto committed Jun 8, 2016
1 parent 1d3daca commit a44d072
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 660 deletions.
@@ -1,14 +1,5 @@
# ../data/source-python/memory/blade/global_pointers.ini

[ITempEntsSystem]
binary = server
srv_check = False
identifier_linux = te
identifier_windows = 55 8B EC 83 EC 20 56 8D 4D E0 E8 2A 2A 2A 2A 8B 75 0C 56
offset_windows = 36
level_windows = 2
level_linux = 1

[CEntityFactoryDictionary]
binary = server
srv_check = False
Expand Down
@@ -1,14 +1,5 @@
# ../data/source-python/memory/csgo/global_pointers.ini

[ITempEntsSystem]
binary = server
srv_check = False
identifier_linux = te
# Search in RadiusFlash(Vector,CBaseEntity *,CBaseEntity *,float,int,int,uchar *,uchar *)
identifier_windows = 55 8B EC 83 E4 F0 81 EC A8 00 00 00 F3 0F 10 45 10
offset_windows = 1334
level = 1

[CEntityFactoryDictionary]
binary = server
srv_check = False
Expand Down
@@ -1,14 +1,5 @@
# ../data/source-python/memory/l4d2/global_pointers.ini

[ITempEntsSystem]
binary = server
identifier_linux = te
# CTankRock::Detonate()
identifier_windows = 55 8B EC 83 EC 34 53 56 8B F1 80 BE 9C 1A 2A 2A 2A
offset_windows = 488
level_linux = 1
level_windows = 2

[CEntityFactoryDictionary]
binary = server
identifier_linux = _ZZ23EntityFactoryDictionaryvE15s_EntityFactory
Expand Down
18 changes: 7 additions & 11 deletions addons/source-python/packages/source-python/effects/__init__.py
Expand Up @@ -19,35 +19,26 @@
# =============================================================================
# Source.Python Imports
# Effects
from _effects import DispatchEffectData
from _effects import PredictionSystem
from _effects import ShatterSurface
from _effects import BloodColor


# =============================================================================
# >> ALL DECLARATION
# =============================================================================
__all__ = ('DispatchEffectData',
'PredictionSystem',
__all__ = ('BloodColor',
'ShatterSurface',
'ball',
'beam',
'box',
'polygon',
'square',
'temp_entities',
)


# ============================================================================
# >> GLOBAL VARIABLES
# ============================================================================
# Get the temp_entities instance...
try:
from _effects import temp_entities
except ImportError:
temp_entities = manager.get_global_pointer('_TempEntities')

# Get the first temp entity in the chain...
try:
from _effects._base import _first_temp_entity
Expand All @@ -69,6 +60,7 @@ def beam(
If you set <parent> to True, the beam is parented to the given entity
index(es).
"""
raise NotImplementedError('Currently not supported.')
start_entity = -1
start_vector = None
end_entity = -1
Expand Down Expand Up @@ -109,6 +101,7 @@ def polygon(
See beam() for more information.
"""
raise NotImplementedError('Currently not supported.')
if len(points) < 3:
raise ValueError('At least 3 points are required.')

Expand All @@ -127,6 +120,7 @@ def square(
frame_rate, life, width, end_width, fade_length, amplitude, red,
green, blue, alpha, speed):
"""Create a square by using _TempEntities.beam_points()."""
raise NotImplementedError('Currently not supported.')
if not isinstance(start, Vector) or not isinstance(end, Vector):
raise TypeError('"start" and "end" must be Vector objects.')

Expand Down Expand Up @@ -157,6 +151,7 @@ def box(
frame_rate, life, width, end_width, fade_length, amplitude, red,
green, blue, alpha, speed):
"""Create a box by using _TempEntities.beam_points()."""
raise NotImplementedError('Currently not supported.')
if not isinstance(start, Vector) or not isinstance(end, Vector):
raise TypeError('"start" and "end" must be Vector objects.')

Expand Down Expand Up @@ -210,6 +205,7 @@ def ball(
The number of steps is used for the lower and upper half. So, if you define
15 steps, 29 rings are created (the center ring is shared by both halves).
"""
raise NotImplementedError('Currently not supported.')
if not isinstance(center, Vector):
raise TypeError('"center" must be Vector object.')

Expand Down
42 changes: 0 additions & 42 deletions addons/source-python/packages/source-python/effects/constants.py

This file was deleted.

2 changes: 0 additions & 2 deletions src/CMakeLists.txt
Expand Up @@ -161,14 +161,12 @@ Set(SOURCEPYTHON_CVARS_MODULE_SOURCES
# ------------------------------------------------------------------
Set(SOURCEPYTHON_EFFECTS_MODULE_HEADERS
core/modules/effects/effects_base.h
core/modules/effects/${SOURCE_ENGINE}/effects_wrap.h
core/modules/effects/${SOURCE_ENGINE}/effects_base_wrap.h
)

Set(SOURCEPYTHON_EFFECTS_MODULE_SOURCES
core/modules/effects/effects_wrap.cpp
core/modules/effects/effects_base_wrap.cpp
core/modules/effects/effects_constants_wrap.cpp
)

# ------------------------------------------------------------------
Expand Down
64 changes: 0 additions & 64 deletions src/core/modules/effects/blade/effects_wrap.h

This file was deleted.

66 changes: 0 additions & 66 deletions src/core/modules/effects/bms/effects_wrap.h

This file was deleted.

56 changes: 0 additions & 56 deletions src/core/modules/effects/csgo/effects_wrap.h

This file was deleted.

0 comments on commit a44d072

Please sign in to comment.