Merge branch 'rc' into release

Author: Doxoh

c-api/cache/CachedPlayer.h

@@ -435,6 +435,8 @@ namespace cache
         void SetHeadBlendData(uint32_t shapeFirstID, uint32_t shapeSecondID, uint32_t shapeThirdID, uint32_t skinFirstID, uint32_t skinSecondID, uint32_t skinThirdID, float shapeMix,
             float skinMix, float thirdMix) override {}
 
+        void RemoveHeadBlendData() override {}
+
         alt::HeadBlendData _headBlendData;
         alt::HeadBlendData GetHeadBlendData() const override {
 			return _headBlendData;

c-api/core.h

@@ -51,6 +51,7 @@ EXPORT_SHARED alt::MValueConst* Core_CreateMValueFunction(alt::ICore* core, Cust
 EXPORT_SHARED uint64_t Core_GetMValueSize(alt::ICore* core, alt::MValueConst* args);
 EXPORT_SHARED uint64_t Core_GetMValueArgsSize(alt::ICore* core, alt::MValueConst* args[], int size);
 
+
 EXPORT_SHARED alt::IPlayer** Core_GetPlayers(alt::ICore* core, uint64_t& size);
 EXPORT_SHARED alt::IVehicle** Core_GetVehicles(alt::ICore* core, uint64_t& size);
 EXPORT_SHARED alt::IPed** Core_GetPeds(alt::ICore* core, uint64_t& size);

c-api/entities/player.cpp

@@ -520,6 +520,11 @@ void Player_SetHeadBlendData(alt::IPlayer* player, uint32_t shapeFirstID, uint32
     player->SetHeadBlendData(shapeFirstID, shapeSecondID, shapeThirdID, skinFirstID, skinSecondID, skinThirdID, shapeMix, skinMix, thirdMix);
 }
 
+void Player_RemoveHeadBlendData(alt::IPlayer* player)
+{
+    player->RemoveHeadBlendData();
+}
+
 void Player_GetHeadBlendData(alt::IPlayer* player, head_blend_data_t &headBlendData) {
     auto playerHeadBlendData = player->GetHeadBlendData();
     headBlendData.shapeFirstID = playerHeadBlendData.shapeFirstID;

c-api/entities/player.h

@@ -152,6 +152,7 @@ EXPORT_SERVER void Player_GetHeadBlendPaletteColor(alt::IPlayer* player, uint8_t
 EXPORT_SERVER void Player_SetHeadBlendData(alt::IPlayer* player, uint32_t shapeFirstID, uint32_t shapeSecondID, uint32_t shapeThirdID,
     uint32_t skinFirstID, uint32_t skinSecondID, uint32_t skinThirdID,
     float shapeMix, float skinMix, float thirdMix);
+EXPORT_SERVER void Player_RemoveHeadBlendData(alt::IPlayer* player);
 EXPORT_SERVER void Player_GetHeadBlendData(alt::IPlayer* player, head_blend_data_t& headBlendData);
 
 EXPORT_SERVER uint8_t Player_SetEyeColor(alt::IPlayer* player, uint16_t eyeColor);

c-api/func_table.cpp

@@ -1,6 +1,6 @@
 #include "func_table.h"
 
-inline uint64_t capiHash = 16677003916101455049UL;
+inline uint64_t capiHash = 13325244553859733034UL;
 inline uint64_t capiHashes[] = {
     0,
     #ifdef ALT_CLIENT_API
@@ -1489,6 +1489,7 @@ inline uint64_t capiHashes[] = {
     2232062854990357196UL,
     3139723963307924640UL,
     1204109734587833282UL,
+    8805714842908729165UL,
     12300710546613769705UL,
     6739305111416325852UL,
     937601034617427157UL,
@@ -3234,6 +3235,7 @@ inline void* capiPointers[] = {
     (void*) Player_RemoveAllWeapons,
     (void*) Player_RemoveDecoration,
     (void*) Player_RemoveFaceFeature,
+    (void*) Player_RemoveHeadBlendData,
     (void*) Player_RemoveHeadOverlay,
     (void*) Player_RemoveWeapon,
     (void*) Player_RemoveWeaponComponent,