Renamed almost all class names

Author: Ayuto

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

@@ -33,7 +33,7 @@
 from configobj import ConfigObjError
 
 # Source.Python Imports
-from cvar_c import CConVar
+from cvar_c import ConVar
 #   ExceptHooks - this is done to register sys.excepthook
 from excepthooks import ExceptHooks
 
@@ -48,21 +48,21 @@
     from _core.settings import _CoreSettingsInstance
 
     # Set the logging level
-    CConVar('sp_logging_level').set_int(
+    ConVar('sp_logging_level').set_int(
         int(_CoreSettingsInstance['LOG_SETTINGS']['level']))
 
     # Set the logging areas
-    CConVar('sp_logging_areas').set_int(
+    ConVar('sp_logging_areas').set_int(
         int(_CoreSettingsInstance['LOG_SETTINGS']['areas']))
 
 # Was an exception raised?
 except (ValueError, ConfigObjError):
 
     # Set the logging level to max (5)
-    CConVar('sp_logging_level').set_int(5)
+    ConVar('sp_logging_level').set_int(5)
 
     # Set the logging area to include console, SP logs, and main log
-    CConVar('sp_logging_areas').set_int(7)
+    ConVar('sp_logging_areas').set_int(7)
 
     # Import the _SPLogger
     from loggers import _SPLogger

addons/source-python/packages/source-python/commands/auth.py

@@ -4,7 +4,7 @@
 # >> IMPORTS
 # =============================================================================
 # Source.Python Imports
-from player_c import CPlayerInfo
+from player_c import PlayerInfo
 from excepthooks import ExceptHooks
 #   Auth
 from auth.manager import AuthManager

addons/source-python/packages/source-python/core.py

@@ -8,7 +8,7 @@
 from os import sep
 
 # Source.Python Imports
-from engine_c import get_engine_interface
+from engine_c import GameEngine
 from paths import GAME_PATH
 from public import public
 
@@ -26,9 +26,6 @@
 # Get the specific game for the server
 GAME_NAME = GAME_PATH.rsplit(sep, 2)[1]
 
-# Get the Engine's instance
-GameEngine = get_engine_interface()
-
 
 # =============================================================================
 # >> CLASSES

addons/source-python/packages/source-python/cvars.py

@@ -12,7 +12,7 @@
 # >> CLASSES
 # =============================================================================
 @public
-class ServerVar(cvar_c.CConVar):
+class ServerVar(cvar_c.ConVar):
     '''ConVar wrapper to provide easy access to cvars.'''
 
     def __init__(

addons/source-python/packages/source-python/entities/entity.py

@@ -5,7 +5,7 @@
 # =============================================================================
 # Source.Python Imports
 #from Source import Binutils
-from entity_c import CEdict
+from entity_c import Edict
 from public import public
 #   Entities
 #from entities.functions import Functions
@@ -28,7 +28,7 @@ def __new__(cls, index, *entities):
             is of the correct entity type and add the index attribute'''
 
         # Get the given indexes edict
-        edict = CEdict(index)
+        edict = Edict(index)
 
         # Is the edict valid?
         if edict.is_free() or not edict.is_valid():
@@ -340,7 +340,7 @@ def instances(self):
 
     @property
     def basehandle(self):
-        '''Returns the entity's CBaseEntityHandle instance'''
+        '''Returns the entity's BaseEntityHandle instance'''
         return self.edict.get_networkable(
             ).get_entity_handle().get_ref_ehandle()
 

addons/source-python/packages/source-python/entities/helpers.py

@@ -4,8 +4,8 @@
 # >> IMPORTS
 # =============================================================================
 # Source.Python Imports
-from entity_c import CBaseEntityHandle
-from entity_c import CEdict
+from entity_c import BaseEntityHandle
+from entity_c import Edict
 from entity_c import index_of_pointer
 from public import public
 
@@ -40,7 +40,7 @@ def index_from_pointer(pointer):
 @public
 def edict_from_index(index):
     '''Returns an edict from the given index'''
-    return CEdict(index)
+    return Edict(index)
 
 
 @public
@@ -76,7 +76,7 @@ def basehandle_from_edict(edict):
 @public
 def basehandle_from_inthandle(ihandle):
     '''Returns a BaseHandle instance from the given handle in int form'''
-    return CBaseEntityHandle(ihandle)
+    return BaseEntityHandle(ihandle)
 
 
 @public

addons/source-python/packages/source-python/events/custom.py

@@ -8,7 +8,7 @@
 from collections import OrderedDict
 
 # Source.Python Imports
-from event_c import CGameEvent
+from event_c import GameEvent
 from public import public
 #   Events
 from events import EventsLogger
@@ -96,7 +96,7 @@ def fire(self):
         '''Fires the event with the stored variable values'''
 
         # Get the event's instance
-        event = CGameEvent(self.name, True)
+        event = GameEvent(self.name, True)
 
         # Loop through the event's variables
         for variable in self._odict:

addons/source-python/packages/source-python/events/listener.py

@@ -4,7 +4,7 @@
 # >> IMPORTS
 # =============================================================================
 # Source.Python Imports
-from event_c import CGameEventListener
+from event_c import GameEventListener
 from excepthooks import ExceptHooks
 from loggers import _SPLogger
 
@@ -36,7 +36,7 @@ def __init__(self, event):
         self.event = event
 
         # Store the listener instance
-        self.listener = CGameEventListener()
+        self.listener = GameEventListener()
 
         # Set the listener's fire_game_event method to the instance's method
         self.listener.fire_game_event = self.fire_game_event

addons/source-python/packages/source-python/events/manager.py

@@ -4,7 +4,7 @@
 # >> IMPORTS
 # =============================================================================
 # Source.Python Imports
-from event_c import get_game_event_manager
+from event_c import GameEventManager
 from loggers import _SPLogger
 from public import public
 #   Events
@@ -14,9 +14,6 @@
 # =============================================================================
 # >> GLOBAL VARIABLES
 # =============================================================================
-# Get the CGameEventManager instance
-GameEventManager = get_game_event_manager()
-
 # Get the sp.events.manager logger
 EventsManagerLogger = _SPLogger.events.manager
 

addons/source-python/packages/source-python/filters/players.py

@@ -85,39 +85,39 @@ def __init__(self, team):
         # Store the team number
         self.team = team
 
-    def _player_is_on_team(self, CPlayerInfo):
+    def _player_is_on_team(self, PlayerInfo):
         '''Returns whether the player is on the team'''
 
         # Return whether the player is on the team
-        return CPlayerInfo.get_team_index() == self.team
+        return PlayerInfo.get_team_index() == self.team
 
 
 # =============================================================================
 # >> FILTER FUNCTIONS
 # =============================================================================
-def _is_player(CPlayerInfo):
+def _is_player(PlayerInfo):
     '''Always returns True, since this is a player'''
     return True
 
 
-def _player_is_bot(CPlayerInfo):
+def _player_is_bot(PlayerInfo):
     '''Returns whether a player is a bot'''
-    return CPlayerInfo.is_fake_client()
+    return PlayerInfo.is_fake_client()
 
 
-def _player_is_human(CPlayerInfo):
+def _player_is_human(PlayerInfo):
     '''Returns whether the player is a human'''
-    return CPlayerInfo.is_player()
+    return PlayerInfo.is_player()
 
 
-def _player_is_alive(CPlayerInfo):
+def _player_is_alive(PlayerInfo):
     '''Returns whether the player is alive'''
-    return not CPlayerInfo.is_dead()
+    return not PlayerInfo.is_dead()
 
 
-def _player_is_dead(CPlayerInfo):
+def _player_is_dead(PlayerInfo):
     '''Returns whether the player is dead'''
-    return CPlayerInfo.is_dead()
+    return PlayerInfo.is_dead()
 
 # Register the filter functions
 PlayerIterManager.register_filter('all', _is_player)
@@ -156,70 +156,70 @@ def _player_is_dead(CPlayerInfo):
 # =============================================================================
 # >> RETURN TYPE FUNCTIONS
 # =============================================================================
-def _return_playerinfo(CPlayerInfo):
-    '''Returns the player's CPlayerInfo instance'''
-    return CPlayerInfo
+def _return_playerinfo(PlayerInfo):
+    '''Returns the player's PlayerInfo instance'''
+    return PlayerInfo
 
 
-def _return_player(CPlayerInfo):
+def _return_player(PlayerInfo):
     '''Returns the player's PlayerEntity instance'''
-    return PlayerEntity(index_from_playerinfo(CPlayerInfo))
+    return PlayerEntity(index_from_playerinfo(PlayerInfo))
 
 
-def _return_name(CPlayerInfo):
+def _return_name(PlayerInfo):
     '''Returns the player's name'''
-    return CPlayerInfo.get_name()
+    return PlayerInfo.get_name()
 
 
-def _return_steamid(CPlayerInfo):
+def _return_steamid(PlayerInfo):
     '''Returns the player's SteamID'''
-    return CPlayerInfo.get_networkid_string()
+    return PlayerInfo.get_networkid_string()
 
 
-def _return_location(CPlayerInfo):
+def _return_location(PlayerInfo):
     '''Returns the player's location Vector'''
-    return CPlayerInfo.get_abs_origin()
+    return PlayerInfo.get_abs_origin()
 
 
-def _return_kills(CPlayerInfo):
+def _return_kills(PlayerInfo):
     '''Returns the player's kill count'''
-    return CPlayerInfo.get_frag_count()
+    return PlayerInfo.get_frag_count()
 
 
-def _return_deaths(CPlayerInfo):
+def _return_deaths(PlayerInfo):
     '''Returns the player's death count'''
-    return CPlayerInfo.get_death_count()
+    return PlayerInfo.get_death_count()
 
 
-def _return_model(CPlayerInfo):
+def _return_model(PlayerInfo):
     '''Returns the player's model'''
-    return CPlayerInfo.get_model_name()
+    return PlayerInfo.get_model_name()
 
 
-def _return_health(CPlayerInfo):
+def _return_health(PlayerInfo):
     '''Returns the player's health value'''
-    return CPlayerInfo.get_health()
+    return PlayerInfo.get_health()
 
 
-def _return_armor(CPlayerInfo):
+def _return_armor(PlayerInfo):
     '''Returns the player's armov value'''
-    return CPlayerInfo.get_armor_value()
+    return PlayerInfo.get_armor_value()
 
 
-def _return_weapon(CPlayerInfo):
+def _return_weapon(PlayerInfo):
     '''Returns the player's currently held weapon'''
-    return CPlayerInfo.get_weapon_name()
+    return PlayerInfo.get_weapon_name()
 
 
-def _return_language(CPlayerInfo):
+def _return_language(PlayerInfo):
     '''Returns the player's language'''
     return GameEngine.get_client_convar_value(
-        index_from_playerinfo(CPlayerInfo), 'cl_language')
+        index_from_playerinfo(PlayerInfo), 'cl_language')
 
 
-def _return_team(CPlayerInfo):
+def _return_team(PlayerInfo):
     '''Returns the player's team'''
-    return CPlayerInfo.get_team_index()
+    return PlayerInfo.get_team_index()
 
 # Register the return type functions
 PlayerIterManager.register_return_type('index', index_from_playerinfo)