Merge branch 'master' into engine_blade

Author: Ayuto

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

@@ -1,11 +1,11 @@
 [function]
 
     [[increment_frag_count]]
-        identifier_windows = 55 8B EC 8B 45 08 01 81 F0 0C 2A 2A 8B 81 F0 0C 2A 2A 89 81 2A 2A 2A 2A 5D C2 04 2A
+        identifier_windows = 55 8B EC 8B 45 08 01 81 F8 0C 00 00
         identifier_linux = _ZN11CBasePlayer18IncrementFragCountEi
         arguments = INT
 
     [[increment_death_count]]
-        identifier_windows = 55 8B EC 8B 45 08 01 81 F4 0C 2A 2A 8B 81 F4 0C 2A 2A 89 81 2A 2A 2A 2A 5D C2 04 2A
+        identifier_windows = 55 8B EC 8B 45 08 01 81 FC 0C 00 00
         identifier_linux = _ZN11CBasePlayer19IncrementDeathCountEi
         arguments = INT

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

@@ -2,51 +2,51 @@
 
     # _ZN11CBasePlayer10BumpWeaponEP17CBaseCombatWeapon
     [[bump_weapon]]
-        offset_linux = 397
-        offset_windows = 396
+        offset_linux = 398
+        offset_windows = 397
         arguments = POINTER
         return_type = BOOL
 
     # _ZN11CBasePlayer11Weapon_DropEP17CBaseCombatWeaponPK6VectorS4_
     [[drop_weapon]]
-        offset_linux = 263
-        offset_windows = 262
+        offset_linux = 264
+        offset_windows = 263
         arguments = POINTER, POINTER, POINTER
         return_type = VOID
 
     # _ZN11CBasePlayer13GiveNamedItemEPKci
     [[give_named_item]]
-        offset_linux = 401
-        offset_windows = 400
+        offset_linux = 402
+        offset_windows = 401
         arguments = STRING, INT
         return_type = POINTER
 
     # _ZN11CBasePlayer14FlashlightIsOnEv
     [[is_flashlight_on]]
-        offset_linux = 354
-        offset_windows = 353
+        offset_linux = 355
+        offset_windows = 354
         return_type = BOOL
 
     # _ZN11CBasePlayer20SetFlashlightEnabledEb
     [[set_flashlight]]
-        offset_linux = 353
-        offset_windows = 352
+        offset_linux = 354
+        offset_windows = 353
         arguments = BOOL
 
     # _ZN11CBasePlayer17FlashlightTurnOffEv
     [[turn_flashlight_off]]
-        offset_linux = 356
-        offset_windows = 355
+        offset_linux = 357
+        offset_windows = 356
 
     # _ZN11CBasePlayer16FlashlightTurnOnEv
     [[turn_flashlight_on]]
-        offset_linux = 355
-        offset_windows = 354
+        offset_linux = 356
+        offset_windows = 355
 
     # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
     [[run_command]]
-        offset_linux = 419
-        offset_windows = 418
+        offset_linux = 420
+        offset_windows = 419
         arguments = POINTER, POINTER
 
 

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

@@ -38,14 +38,14 @@
 
     # _ZN9CCSPlayer12Weapon_EquipEP17CBaseCombatWeapon
     [[equip_weapon]]
-        offset_linux = 261
-        offset_windows = 260
+        offset_linux = 262
+        offset_windows = 261
         arguments = POINTER
 
     # _ZN9CCSPlayer5BlindEfff
     [[blind]]
-        offset_linux = 468
-        offset_windows = 465
+        offset_linux = 469
+        offset_windows = 466
         arguments = FLOAT, FLOAT, FLOAT
 
 
@@ -57,13 +57,13 @@
 [instance_attribute]
 
     [[mvps]]
-        offset_windows = 6328
-        offset_linux = 6348
+        offset_windows = 6384
+        offset_linux = 6404
         type = INT
 
     [[clan_tag]]
-        offset_windows = 5580
-        offset_linux = 5600
+        offset_windows = 5628
+        offset_linux = 5648
         type = STRING_ARRAY
 
 

addons/source-python/data/source-python/entities/orangebox/cstrike/CKnife.ini

@@ -1,9 +1,9 @@
 [virtual_function]
 
     [[primary_attack]]
-        offset_linux = 273
-        offset_windows = 272
-
-    [[secondary_attack]]
         offset_linux = 274
         offset_windows = 273
+
+    [[secondary_attack]]
+        offset_linux = 275
+        offset_windows = 274

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

@@ -5,6 +5,6 @@ binary = server
 [function]
     [[fire_output]]
         identifier_linux = _ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f
-        identifier_windows = 55 8B EC 81 EC 24 01 2A 2A 53
+        identifier_windows = 55 8B EC 81 EC 24 01 00 00 53 8B C1
         arguments_linux = POINTER, POINTER, POINTER, FLOAT
         arguments_windows = INT, INT, INT, INT, POINTER, POINTER, POINTER, FLOAT

addons/source-python/packages/source-python/menus/queue.py

@@ -189,15 +189,15 @@ def pop(self, key, default=None):
 # =============================================================================
 # >> FUNCTIONS
 # =============================================================================
-def _validate_selection(player_info, command, valid_choices):
+def _validate_selection(command, index, valid_choices):
     """Validate a selection command.
 
-    @param <player_infor>:
-    A PlayerInfo instance.
-
     @param <command>:
     A Command instance.
 
+    @param <index>:
+    The player index that issued the command.
+
     @param <valid_choices>:
     A list of integers that defines all valid choices
     """
@@ -208,7 +208,7 @@ def _validate_selection(player_info, command, valid_choices):
         return (None, None)
 
     if choice in valid_choices:
-        return (index_from_playerinfo(player_info), choice)
+        return (index, choice)
 
     return (None, None)
 
@@ -242,21 +242,21 @@ def _esc_refresh():
 # >> CLIENT COMMANDS
 # =============================================================================
 @ClientCommand('menuselect')
-def _menuselect_callback(player_info, command):
+def _menuselect_callback(command, index):
     """Forward the selection to the proper user queue."""
     from menus.radio import VALID_CHOICES
 
-    index, choice = _validate_selection(player_info, command, VALID_CHOICES)
+    index, choice = _validate_selection(command, index, VALID_CHOICES)
     if index is not None:
         _radio_queues[index]._select(choice)
 
 
 @ClientCommand(ESC_SELECTION_CMD)
-def _escselect_callback(player_info, command):
+def _escselect_callback(command, index):
     """Forward the selection to the proper user queue."""
     from menus.esc import VALID_CHOICES
 
-    index, choice = _validate_selection(player_info, command, VALID_CHOICES)
+    index, choice = _validate_selection(command, index, VALID_CHOICES)
     if index is not None:
         _esc_queues[index]._select(choice)
 

addons/source-python/packages/source-python/menus/radio.py

@@ -41,9 +41,9 @@
 else:
     BUTTON_BACK = 8
     BUTTON_NEXT = 9
-    BUTTON_CLOSE = 0
+    BUTTON_CLOSE = 10
     MAX_ITEM_COUNT = 7
-    VALID_CHOICES = range(10)
+    VALID_CHOICES = range(1, 11)
 
 
 # =============================================================================

src/core/sp_main.cpp

@@ -147,6 +147,12 @@ InterfaceHelper_t gEngineInterfaces[] = {
 	{NULL, NULL}
 };
 
+// TODO: This is just a quick fix. The real fix is coming soon.
+#ifdef ENGINE_ORANGEBOX
+	#undef INTERFACEVERSION_SERVERGAMEDLL
+	#define INTERFACEVERSION_SERVERGAMEDLL "ServerGameDLL010"
+#endif
+
 InterfaceHelper_t gGameInterfaces[] = {
 	{INTERFACEVERSION_PLAYERINFOMANAGER, (void **)&playerinfomanager},
 	{INTERFACEVERSION_PLAYERBOTMANAGER, (void **)&botmanager},