v1.2

- Code optimisations
- Added stripper_dump command

stripper.sp

@@ -1,19 +1,17 @@
-#pragma newdecls required
 #pragma semicolon 1
+#pragma newdecls required
 
 #include <sourcemod>
 #include <regex>
 
-#define PLUGIN_VERSION "1.1.0"
-
 public Plugin myinfo =
 {
     name		= "Stripper:Source (SP edition)",
-    author = "tilgep, Stripper:Source by BAILOPAN",
+    version		= "1.2.0",
     description	= "Stripper:Source functionality in a Sourcemod plugin",
-    version = PLUGIN_VERSION,
+    author		= "tilgep, Stripper:Source by BAILOPAN",
-    url = ""
+    url			= "https://forums.alliedmods.net/showthread.php?t=339448"
-};
+}
 
 enum Mode
 {
@@ -34,8 +32,8 @@ enum SubMode
 
 enum struct Property
 {
-    char key[255];
+    char key[PLATFORM_MAX_PATH];
-    char val[255];
+    char val[PLATFORM_MAX_PATH];
     bool regex;
 }
 
@@ -79,6 +77,59 @@ int section;
 public void OnPluginStart()
 {
     prop.Init();
+
+    RegAdminCmd("stripper_dump", Command_Dump, ADMFLAG_ROOT, "Writes all of the map entity properties to a file in configs/stripper/dumps/");
+}
+
+public Action Command_Dump(int client, int args)
+{
+    char buf1[PLATFORM_MAX_PATH], buf2[PLATFORM_MAX_PATH], path[PLATFORM_MAX_PATH];
+    int num = -1;
+
+    GetCurrentMap(buf1, PLATFORM_MAX_PATH);
+
+    BuildPath(Path_SM, buf2, PLATFORM_MAX_PATH, "configs/stripper/dumps");
+    
+    if(!DirExists(buf1)) CreateDirectory(buf1);
+
+    do
+    {
+        num++;
+        // Use same format as original stripper
+        Format(path, PLATFORM_MAX_PATH, "%s/%s.%04d.cfg", buf2, buf1, num);
+    }
+    while(FileExists(path));
+
+    File fi = OpenFile(path, "w");
+    if(fi == null)
+    {
+        LogError("Failed to create dump file \"%s\"", path);
+        return Plugin_Handled;
+    }
+
+    EntityLumpEntry ent;
+
+    for(int i = 0; i < EntityLump.Length(); i++)
+    {
+        ent = EntityLump.Get(i);
+
+        fi.WriteLine("{");
+
+        for(int j = 0; j < ent.Length; j++)
+        {
+            ent.Get(j, buf1, PLATFORM_MAX_PATH, buf2, PLATFORM_MAX_PATH);
+            fi.WriteLine("\"%s\" \"%s\"", buf1, buf2);
+        }
+
+        fi.WriteLine("}");
+
+        delete ent;
+    }
+
+    delete fi;
+    
+    ReplyToCommand(client, "[SM] Dumped entities to '%s'", path);
+    return Plugin_Handled;
 }
 
 public void OnMapInit(const char[] mapName)
@@ -103,8 +154,7 @@ public void OnMapInit(const char[] mapName)
 public void ParseFile()
 {
     char error[128];
-    int line = 0;
+    int line, col;
-    int col = 0;
     section = 0;
 
     prop.Clear();
@@ -125,7 +175,7 @@ public void ParseFile()
 public SMCResult Config_NewSection(SMCParser smc, const char[] name, bool opt_quotes)
 {
     section++;
-    if (StrEqual(name, "filter:", false) || StrEqual(name, "remove:", false))
+    if(!strcmp(name, "filter:", false) || !strcmp(name, "remove:", false))
     {
         if(prop.mode != Mode_None)
         {
@@ -135,7 +185,7 @@ public SMCResult Config_NewSection(SMCParser smc, const char[] name, bool opt_qu
         prop.Clear();
         prop.mode = Mode_Filter;
     }
-    else if (StrEqual(name, "add:", false))
+    else if(!strcmp(name, "add:", false))
     {
         if(prop.mode != Mode_None)
         {
@@ -145,7 +195,7 @@ public SMCResult Config_NewSection(SMCParser smc, const char[] name, bool opt_qu
         prop.Clear();
         prop.mode = Mode_Add;
     }
-    else if (StrEqual(name, "modify:", false))
+    else if(!strcmp(name, "modify:", false))
     {
         if(prop.mode != Mode_None)
         {
@@ -157,22 +207,10 @@ public SMCResult Config_NewSection(SMCParser smc, const char[] name, bool opt_qu
     }
     else if(prop.mode == Mode_Modify)
     {
-        if (StrEqual(name, "match:", false))
+        if(!strcmp(name, "match:", false))			prop.submode = SubMode_Match;
-        {
+        else if(!strcmp(name, "replace:", false))	prop.submode = SubMode_Replace;
-            prop.submode = SubMode_Match;
+        else if(!strcmp(name, "delete:", false))	prop.submode = SubMode_Delete;
-        }
+        else if(!strcmp(name, "insert:", false))	prop.submode = SubMode_Insert;
-        else if (StrEqual(name, "replace:", false))
-        {
-            prop.submode = SubMode_Replace;
-        }
-        if (StrEqual(name, "delete:", false))
-        {
-            prop.submode = SubMode_Delete;
-        }
-        if (StrEqual(name, "insert:", false))
-        {
-            prop.submode = SubMode_Insert;
-        }
     }
 
     return SMCParse_Continue;
@@ -181,28 +219,18 @@ public SMCResult Config_NewSection(SMCParser smc, const char[] name, bool opt_qu
 public SMCResult Config_KeyValue(SMCParser smc, const char[] key, const char[] value, bool key_quotes, bool value_quotes)
 {
     Property kv;
-    strcopy(kv.key, 255, key);
+    strcopy(kv.key, PLATFORM_MAX_PATH, key);
-    strcopy(kv.val, 255, value);
+    strcopy(kv.val, PLATFORM_MAX_PATH, value);
     kv.regex = FormatRegex(kv.val, strlen(value));
 
     switch(prop.mode)
     {
-        case Mode_None:
+        case Mode_None:		return SMCParse_Continue;
-        {
+        case Mode_Filter:	prop.match.PushArray(kv);
-            /* 
-             * we shouldn't be getting key values if we aren't in a section
-             * ignore them and keep going
-             */
-            return SMCParse_Continue;
-        }
-        case Mode_Filter:
-        {
-            prop.match.PushArray(kv);
-        }
         case Mode_Add:
         {
-            // Adding an entity without a classname will crash the server
+            // Adding an entity without a classname will crash the server (shortest classname is "gib")
-            if(StrEqual(key, "classname", false)) prop.hasClassname = true;
+            if(StrEqual(key, "classname", false) && strlen(value) > 2) prop.hasClassname = true;
 
             prop.insert.PushArray(kv);
         }
@@ -210,22 +238,10 @@ public SMCResult Config_KeyValue(SMCParser smc, const char[] key, const char[] v
         {
             switch(prop.submode)
             {
-                case SubMode_Match:
+                case SubMode_Match:		prop.match.PushArray(kv);
-                {
+                case SubMode_Replace:	prop.replace.PushArray(kv);
-                    prop.match.PushArray(kv);
+                case SubMode_Delete:	prop.del.PushArray(kv);
-                }
+                case SubMode_Insert:	prop.insert.PushArray(kv);
-                case SubMode_Replace:
-                {
-                    prop.replace.PushArray(kv);
-                }
-                case SubMode_Delete:
-                {
-                    prop.del.PushArray(kv);
-                }
-                case SubMode_Insert:
-                {
-                    prop.insert.PushArray(kv);
-                }
             }
         }
     }
@@ -239,10 +255,7 @@ public SMCResult Config_EndSection(SMCParser smc)
     {
         case Mode_Filter:
         {
-            if (prop.match.Length > 0)
+            if(prop.match.Length > 0) RunRemoveFilter();
-            {
-                RunRemoveFilter();
-            }
 
             prop.mode = Mode_None;
         }
@@ -250,14 +263,8 @@ public SMCResult Config_EndSection(SMCParser smc)
         {
             if(prop.insert.Length > 0)
             {
-                if(prop.hasClassname)
+                if(prop.hasClassname) RunAddFilter();
-                {
+                else LogError("Add block with no classname found at section %d in file '%s'", section, file);
-                    RunAddFilter();
-                }
-                else
-                {
-                    LogError("Add block with no classname found at section %d in file '%s'", section, file);
-                }
             }
 
             prop.mode = Mode_None;
@@ -271,11 +278,8 @@ public SMCResult Config_EndSection(SMCParser smc)
                 return SMCParse_Continue;
             }
 
-            // Must have some match for modify blocks
+            // Must have something to match for modify blocks
-            if (prop.match.Length > 0)
+            if(prop.match.Length > 0) RunModifyFilter();
-            {
-                RunModifyFilter();
-            }
 
             prop.mode = Mode_None;
         }
@@ -289,20 +293,19 @@ public void RunRemoveFilter()
      * we know it has at least 1 entry here
      */
 
-    char val2[255];
+    char val2[PLATFORM_MAX_PATH];
-
-    for (int i = 0; i < EntityLump.Length(); i++)
-    {
-        int matches = 0;
-        EntityLumpEntry entry = EntityLump.Get(i);
-
-        for(int j = 0; j < prop.match.Length; j++)
-        {
     Property kv;
+    EntityLumpEntry entry;
+    for(int i, matches, j, index; i < EntityLump.Length(); i++)
+    {
+        matches = 0;
+        entry = EntityLump.Get(i);
+
+        for(j = 0; j < prop.match.Length; j++)
+        {
             prop.match.GetArray(j, kv, sizeof(kv));
 
-            int index = entry.GetNextKey(kv.key, val2, sizeof(val2));
+            index = entry.GetNextKey(kv.key, val2, sizeof(val2));
-            
             while(index != -1)
             {
                 if(EntPropsMatch(kv.val, val2, kv.regex))
@@ -333,11 +336,10 @@ public void RunAddFilter()
     int index = EntityLump.Append();
     EntityLumpEntry entry = EntityLump.Get(index);
 
-    for(int i = 0; i < prop.insert.Length; i++)
-    {
     Property kv;
+    for(int i; i < prop.insert.Length; i++)
+    {
         prop.insert.GetArray(i, kv, sizeof(kv));
-
         entry.Append(kv.key, kv.val);
     }
 
@@ -356,21 +358,21 @@ public void RunModifyFilter()
         return;
     }
 
-    char val2[255];
+    char val2[PLATFORM_MAX_PATH];
 
-    for (int i = 0; i < EntityLump.Length(); i++)
+    Property kv;
+    EntityLumpEntry entry;
+    for(int i, matches, j, index; i < EntityLump.Length(); i++)
     {
-        int matches = 0;
+        matches = 0;
-        EntityLumpEntry entry = EntityLump.Get(i);
+        entry = EntityLump.Get(i);
 
         /* Check matches */
-        for(int j = 0; j < prop.match.Length; j++)
+        for(j = 0; j < prop.match.Length; j++)
         {
-            Property kv;
             prop.match.GetArray(j, kv, sizeof(kv));
 
-            int index = entry.GetNextKey(kv.key, val2, sizeof(val2));
+            index = entry.GetNextKey(kv.key, val2, sizeof(val2));
-            
             while(index != -1)
             {
                 if(EntPropsMatch(kv.val, val2, kv.regex))
@@ -394,12 +396,11 @@ public void RunModifyFilter()
         /* First do deletions */
         if(prop.del.Length > 0)
         {
-            for(int j = 0; j < prop.del.Length; j++)
+            for(j = 0; j < prop.del.Length; j++)
             {
-                Property kv;
                 prop.del.GetArray(j, kv, sizeof(kv));
 
-                int index = entry.GetNextKey(kv.key, val2, sizeof(val2));
+                index = entry.GetNextKey(kv.key, val2, sizeof(val2));
                 while(index != -1)
                 {
                     if(EntPropsMatch(kv.val, val2, kv.regex))
@@ -415,12 +416,11 @@ public void RunModifyFilter()
         /* do replacements */
         if(prop.replace.Length > 0)
         {
-            for(int j = 0; j < prop.replace.Length; j++)
+            for(j = 0; j < prop.replace.Length; j++)
             {
-                Property kv;
                 prop.replace.GetArray(j, kv, sizeof(kv));
 
-                int index = entry.GetNextKey(kv.key, val2, sizeof(val2));
+                index = entry.GetNextKey(kv.key, val2, sizeof(val2));
                 while(index != -1)
                 {
                     entry.Update(index, NULL_STRING, kv.val);
@@ -432,11 +432,9 @@ public void RunModifyFilter()
         /* do insertions */
         if(prop.insert.Length > 0)
         {
-            for(int j = 0; j < prop.insert.Length; j++)
+            for(j = 0; j < prop.insert.Length; j++)
             {
-                Property kv;
                 prop.insert.GetArray(j, kv, sizeof(kv));
-
                 entry.Append(kv.key, kv.val);
             }
         }
@@ -456,12 +454,7 @@ public void RunModifyFilter()
  */
 stock bool EntPropsMatch(const char[] val1, const char[] val2, bool isRegex)
 {
-    if (isRegex)
+    return isRegex ? SimpleRegexMatch(val2, val1) > 0 : !strcmp(val1, val2);
-    {
-        return SimpleRegexMatch(val2, val1) > 0;
-    }
-    
-    return StrEqual(val1, val2);
 }
 
 stock bool FormatRegex(char[] pattern, int len)
@@ -471,5 +464,6 @@ stock bool FormatRegex(char[] pattern, int len)
         strcopy(pattern, len-1, pattern[1]);
         return true;
     }
+
     return false;
 }