Started implementation of converting GameEvent instances in events/pre-events to dictionaries and passing them as keyword arguments.

Thanks to @MarkusMeskanen for suggesting this: http://forums.sourcepython.com/showthread.php?960

Author: satoon101

addons/source-python/packages/source-python/engines/precache.py

@@ -104,7 +104,7 @@ def _precache(self):
         """Precache the path."""
         self._precache_method(self._path, self._preload)
 
-    def _server_spawn(self, game_event):
+    def _server_spawn(self, **kwargs):
         """Precache the object on map change."""
         self._precache()
 

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

@@ -17,7 +17,10 @@
 from events.manager import game_event_manager
 #   Hooks
 from hooks.exceptions import except_hooks
+#   KeyValues
+from keyvalues import KeyValues
 #   Memory
+from memory import get_object_pointer
 from memory import get_virtual_function
 from memory import make_object
 from memory.hooks import PreHook
@@ -176,14 +179,19 @@ def _pre_game_event(args):
     # Create a variable to know what to do after all pre-events are called
     event_action = EventAction.CONTINUE
 
+    # Convert the GameEvent object into a dictionary
+    # TODO: use data or some other means to get the offset
+    kwargs = make_object(
+        KeyValues, get_object_pointer(game_event).get_pointer(8)).as_dict()
+
     # Loop through all callbacks in the pre-event's list
     for callback in pre_event_manager[event_name]:
 
         # Use try/except in case an error occurs during in the callback
         try:
 
             # Call the callback and get its return value
-            current_action = callback(game_event)
+            current_action = callback(**kwargs)
 
             # Is the return value invalid?
             if (current_action is not None and

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

@@ -8,8 +8,13 @@
 # Source.Python Imports
 #   Hooks
 from hooks.exceptions import except_hooks
+#   KeyValues
+from keyvalues import KeyValues
 #   Loggers
 from loggers import _sp_logger
+#   Memory
+from memory import get_object_pointer
+from memory import make_object
 
 
 # =============================================================================
@@ -82,14 +87,19 @@ def remove(self, callback):
 
     def fire_game_event(self, game_event):
         """Loop through all callbacks for an event and calls them."""
+        # Convert the GameEvent object into a dictionary
+        # TODO: use data or some other means to get the offset
+        kwargs = make_object(
+            KeyValues, get_object_pointer(game_event).get_pointer(8)).as_dict()
+
         # Loop through each callback in the event's list
         for callback in self:
 
             # Try to call the callback
             try:
 
                 # Call the callback
-                callback(game_event)
+                callback(**kwargs)
 
             # Was an error encountered?
             except:

addons/source-python/packages/source-python/settings/storage.py

@@ -150,7 +150,7 @@ def cursor(self):
         """Return the cursor instance."""
         return self._cursor
 
-    def server_spawn(self, game_event):
+    def server_spawn(self, **kwargs):
         """Store the dictionary to the database on map change."""
         self.connection.commit()
 

addons/source-python/packages/source-python/stringtables/downloads.py

@@ -82,7 +82,7 @@ def _add_to_download_table(self, item):
         # Add the given file to the downloadables table.
         self.download_table.add_string(item, item)
 
-    def server_spawn(self, game_event):
+    def server_spawn(self, **kwargs):
         """Add all items stored as downloadables to the stringtable."""
         # Refresh the downloadables table instance
         self._refresh_table_instance()