Replace some patterns in JSON schema with enums. Fix parsing attenuat…

…ion from string
FreeSlave · Oct 18, 2024 · ad54d81 · ad54d81
1 parent 1cf193c
commit ad54d81
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dlls/soundscripts.cpp b/dlls/soundscripts.cpp
@@ -191,7 +191,7 @@ static const char* ChannelToString(int channel)
 
 static bool ParseAttenuation(const char* str, float& attenuation)
 {
-	constexpr std::pair<const char*, int> attenuations[] = {
+	constexpr std::pair<const char*, float> attenuations[] = {
 		{"norm", ATTN_NORM},
 		{"idle", ATTN_IDLE},
 		{"static", ATTN_STATIC},

diff --git a/game_shared/json_utils.cpp b/game_shared/json_utils.cpp
@@ -83,15 +83,15 @@ constexpr const char definitions[] = R"(
       },
       "channel": {
         "type": "string",
-        "pattern": "^auto|weapon|voice|item|body|static$"
+        "enum": ["Auto","auto","Weapon","weapon","Voice","voice","Item","item","Body","body","Static","static"]
       },
       "volume": {
         "$ref": "#/range"
       },
       "attenuation": {
         "type": ["number", "string"],
         "minimum": 0,
-        "pattern": "^norm|idle|static|none$"
+        "enum": ["Norm","norm","Idle","idle","Static","static","None","none"]
       },
       "pitch": {
         "$ref": "#/range_int"
@@ -109,7 +109,7 @@ constexpr const char definitions[] = R"(
       },
       "rendermode": {
         "type": "string",
-        "pattern": ["Normal","normal","Color","color","Texture","texture","Glow","glow","Solid","solid","Additive","additive$"]
+        "pattern": ["Normal","normal","Color","color","Texture","texture","Glow","glow","Solid","solid","Additive","additive"]
       },
       "color": {
         "$ref": "definitions.json#/color"