Remove explicit priorities

Author: chrb22

README.md

@@ -7,7 +7,7 @@ Extract/copy the files into the game folder.
 Currently the extension only supports 32-bit TF2, but it can in idea work with other games by expanding the gamedata.
 
 ## Usage
-The extension works with entity properties, the same that you're used to with the `SetEntProp[Type]` functions, except it doesn't set the entity property itself, but instead modifies the sent value. Since not all properties are networkable, the extension allows you to verify if an entity property is networkable through `HasNetworkableProp`. After you know a property is networkable, you can set its sent value with `SetSendVar`, replace it only if its already going to be sent with `ReplaceSendVar`, or prevent it from being sent with `OmitSendVar`. 
+The extension works with entity properties, the same that you're used to with the `SetEntProp[Type]` functions, except it doesn't set the entity property itself, but instead modifies the sent value. Since not all properties are networkable, the extension allows you to verify if an entity property is networkable through `HasNetworkableProp`. After you know a property is networkable, you can set its sent value with `SetSendVar`, replace it only if its already going to be sent with `ReplaceSendVar`, or prevent it from being sent with `OmitSendVar`. If a property has multiple edits applied at the same time, then the extension will prioritize edits that use most important action present (`Set` > `Replace` > `Omit`, individual > everyone) and choose the latest amongst those.
 
 `SetSendVar` and `ReplaceSendVar` take a custom value that are stored in a handle. These handles can be created with the `SendVar[Type]` functions, where `Type` is the sent type of the property. All handles are automatically freed at the end of the frame, so you can use `SendVar[Type]` directly in the argument of `[Set/Replace]SendVar` without worry. Some properties go through a conversion function called a proxy that might even change its sent type, so make sure to use the proxy output instead if it exists. The extension provides a few such proxies named `SendProxy[Type]` for convenience.
 

extension.cpp

@@ -90,7 +90,7 @@ using SharedVariant = std::shared_ptr<Variant>;
 struct Edit
 {
     EditAction action;
-    int priority;
+    bool all_clients;
     int propindex;
     const SendProp* prop;
     const SharedVariant variant;
@@ -1033,15 +1033,14 @@ bool IsValidClient(IPluginContext* pContext, int client)
     return true;
 }
 
-// void SetSendVar(int entity, int client, const char[] prop, Handle value, int priority = 0)
+// void SetSendVar(int entity, int client, const char[] prop, Handle value)
 cell_t smn_SetSendVar(IPluginContext* pContext, const cell_t* params)
 {
     int entref = params[1];
     int client = params[2];
     char* propname;
     pContext->LocalToString(params[3], &propname);
     Handle_t handle = params[4];
-    int priority = params[5];
 
     if (client != -1 && !IsValidClient(pContext, client))
         return 0;
@@ -1066,21 +1065,20 @@ cell_t smn_SetSendVar(IPluginContext* pContext, const cell_t* params)
         );
     }
 
-    SharedEdit edit = std::make_shared<Edit>(Edit{EditAction::SET, priority, info.propindex, info.prop, *variant});
+    SharedEdit edit = std::make_shared<Edit>(Edit{EditAction::SET, client == -1, info.propindex, info.prop, *variant});
     AddSendVarEdit(entref, client, edit);
 
     return 0;
 }
 
-// void ReplaceSendVar(int entity, int client, const char[] prop, Handle value, int priority = 0)
+// void ReplaceSendVar(int entity, int client, const char[] prop, Handle value)
 cell_t smn_ReplaceSendVar(IPluginContext* pContext, const cell_t* params)
 {
     int entref = params[1];
     int client = params[2];
     char* propname;
     pContext->LocalToString(params[3], &propname);
     Handle_t handle = params[4];
-    int priority = params[5];
 
     if (client != -1 && !IsValidClient(pContext, client))
         return 0;
@@ -1105,20 +1103,19 @@ cell_t smn_ReplaceSendVar(IPluginContext* pContext, const cell_t* params)
         );
     }
 
-    SharedEdit edit = std::make_shared<Edit>(Edit{EditAction::REPLACE, priority, info.propindex, info.prop, *variant});
+    SharedEdit edit = std::make_shared<Edit>(Edit{EditAction::REPLACE, client == -1, info.propindex, info.prop, *variant});
     AddSendVarEdit(entref, client, edit);
 
     return 0;
 }
 
-// void OmitSendVar(int entity, int client, const char[] prop, int priority = 0)
+// void OmitSendVar(int entity, int client, const char[] prop)
 cell_t smn_OmitSendVar(IPluginContext* pContext, const cell_t* params)
 {
     int entref = params[1];
     int client = params[2];
     char* propname;
     pContext->LocalToString(params[3], &propname);
-    int priority = params[4];
 
     if (client != -1 && !IsValidClient(pContext, client))
         return 0;
@@ -1127,7 +1124,7 @@ cell_t smn_OmitSendVar(IPluginContext* pContext, const cell_t* params)
     if (!FindEntitySendPropInfo(pContext, entref, propname, &info))
         return 0;
 
-    SharedEdit edit = std::make_shared<Edit>(Edit{EditAction::OMIT, priority, info.propindex, info.prop, SharedVariant{}});
+    SharedEdit edit = std::make_shared<Edit>(Edit{EditAction::OMIT, client == -1, info.propindex, info.prop, SharedVariant{}});
     AddSendVarEdit(entref, client, edit);
 
     return 0;
@@ -1329,7 +1326,11 @@ void Hook_SendTable_WritePropList(SendTable* sendtable, void* inputdata, int inp
         edits.begin(),
         edits.end(),
         [](const SharedEdit &a, const SharedEdit &b) {
-            return a->propindex < b->propindex || (a->propindex == b->propindex && a->priority > b->priority);
+            return (
+                (a->propindex < b->propindex) ||
+                (a->propindex == b->propindex && a->action < b->action) ||
+                (a->propindex == b->propindex && a->action == b->action && a->all_clients < b->all_clients)
+            );
         }
     );
     edits.erase(

include/sendvaredit.inc

@@ -125,9 +125,8 @@ native Handle SendVarString(const char[] string);
  * @param client            Player's index. Use -1 to target everyone.
  * @param prop              Property name.
  * @param value             Value to set (get handle from SendVar[Type] functions).
- * @param priority          Priority for this edit.
  */
-native void SetSendVar(int entity, int client, const char[] prop, Handle value, int priority = 0)
+native void SetSendVar(int entity, int client, const char[] prop, Handle value)
 
 /**
  * Replace the networked value of an entity's property next time the client is sent an update.
@@ -136,19 +135,17 @@ native void SetSendVar(int entity, int client, const char[] prop, Handle value,
  * @param client            Player's index. Use -1 to target everyone.
  * @param prop              Property name.
  * @param value             Value to set (get handle from SendVar[Type] functions).
- * @param priority          Priority for this edit.
  */
-native void ReplaceSendVar(int entity, int client, const char[] prop, Handle value, int priority = 0)
+native void ReplaceSendVar(int entity, int client, const char[] prop, Handle value)
 
 /**
  * Prevents an entity's property from being included next time the client is sent an update.
  *
  * @param entity            Entity/edict index.
  * @param client            Player's index. Use -1 to target everyone.
  * @param prop              Property name.
- * @param priority          Priority for this edit.
  */
-native void OmitSendVar(int entity, int client, const char[] prop, int priority = 0)
+native void OmitSendVar(int entity, int client, const char[] prop)
 
 public Extension __ext_sendvaredit = 
 {

smsdk_config.h

@@ -40,7 +40,7 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"SendVarEdit"
 #define SMEXT_CONF_DESCRIPTION	"Manipulate networked property values per client"
-#define SMEXT_CONF_VERSION		"1.3.1"
+#define SMEXT_CONF_VERSION		"1.3.2"
 #define SMEXT_CONF_AUTHOR		"ILDPRUT"
 #define SMEXT_CONF_URL			"https://github.com/chrb22/sendvaredit"
 #define SMEXT_CONF_LOGTAG		"SENDVAREDIT"