Added DP_QC_STRING_CASE_FUNCTIONS extension, providing VM functions strtolower and...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7216 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 813207148272e648dd24a99aeb57fc01c2f18f0b..2d820b85f48a6a19c8b4daaf7f5d5767e7805fab 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -3162,8 +3162,8 @@ VM_strlennocol,                                   // #476 float(string s) : DRESK - String Length (not countin
 VM_strdecolorize,                              // #477 string(string s) : DRESK - Decolorized String (DP_QC_STRINGCOLORFUNCTIONS)
 VM_strftime,                                   // #478 string(float uselocaltime, string format, ...) (DP_QC_STRFTIME)
 VM_tokenizebyseparator,                        // #479 float(string s) tokenizebyseparator (DP_QC_TOKENIZEBYSEPARATOR)
-NULL,                                                  // #480
-NULL,                                                  // #481
+VM_strtolower,                                 // #480 string(string s) VM_strtolower : DRESK - Return string as lowercase
+VM_strtoupper,                                 // #481 string(string s) VM_strtoupper : DRESK - Return string as uppercase
 NULL,                                                  // #482
 NULL,                                                  // #483
 NULL,                                                  // #484

diff --git a/common.h b/common.h
index 3d960d136e13308365eb1e6b4e5a9f3aa3309a5a..6bd42a298189b4a95405f12c76ab1e93fcd6a1f9 100644 (file)
--- a/common.h
+++ b/common.h
@@ -289,6 +289,8 @@ int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *t
 
 size_t COM_StringLengthNoColors(const char *s, size_t size_s, qboolean *valid);
 qboolean COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qboolean escape_carets);
+void COM_ToLowerString (const char *in, char *out, size_t size_out);
+void COM_ToUpperString (const char *in, char *out, size_t size_out);
 
 typedef struct stringlist_s
 {

diff --git a/mvm_cmds.c b/mvm_cmds.c
index b5f7927895d8d1ae4dbc55528e6832f58995bdd5..80ea17e256ad097cf675c1bbf59b7673469a508c 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -9,6 +9,7 @@ char *vm_m_extensions =
 "DP_MENU_EXTRESPONSEPACKET "
 "DP_QC_ASINACOSATANATAN2TAN "
 "DP_QC_STRFTIME "
+"DP_QC_STRING_CASE_FUNCTIONS "
 "DP_QC_STRINGCOLORFUNCTIONS "
 "DP_QC_TOKENIZEBYSEPARATOR "
 "DP_QC_UNLIMITEDTEMPSTRINGS "
@@ -1238,8 +1239,8 @@ VM_strlennocol,                           // #476 float(string s) : DRESK - String Length (not counting
 VM_strdecolorize,                      // #477 string(string s) : DRESK - Decolorized String (DP_QC_STRINGCOLORFUNCTIONS)
 VM_strftime,                           // #478 string(float uselocaltime, string format, ...) (DP_QC_STRFTIME)
 VM_tokenizebyseparator,                // #479 float(string s) tokenizebyseparator (DP_QC_TOKENIZEBYSEPARATOR)
-NULL,                                          // #480
-NULL,                                          // #481
+VM_strtolower,                         // #480 string(string s) VM_strtolower : DRESK - Return string as lowercase
+VM_strtoupper,                         // #481 string(string s) VM_strtoupper : DRESK - Return string as uppercase
 NULL,                                          // #482
 NULL,                                          // #483
 NULL,                                          // #484

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 73816935ce56b2e4e5123cc36a501ffad76b7670..7c74a06002c652586111132b145552b621ad3d47 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -1788,6 +1788,51 @@ void VM_strlennocol(void)
        PRVM_G_FLOAT(OFS_RETURN) = nCnt;
 }
 
+// DRESK - String to Uppercase and Lowercase
+/*
+=========
+VM_strtolower
+
+string strtolower(string s)
+=========
+*/
+// string (string s) strtolower = #480; // returns passed in string in lowercase form
+void VM_strtolower(void)
+{
+       char szNewString[VM_STRINGTEMP_LENGTH];
+       const char *szString;
+
+       // Prepare Strings
+       VM_SAFEPARMCOUNT(1,VM_strtolower);
+       szString = PRVM_G_STRING(OFS_PARM0);
+
+       COM_ToLowerString(szString, szNewString, sizeof(szNewString) );
+
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
+}
+
+/*
+=========
+VM_strtoupper
+
+string strtoupper(string s)
+=========
+*/
+// string (string s) strtoupper = #481; // returns passed in string in uppercase form
+void VM_strtoupper(void)
+{
+       char szNewString[VM_STRINGTEMP_LENGTH];
+       const char *szString;
+
+       // Prepare Strings
+       VM_SAFEPARMCOUNT(1,VM_strtoupper);
+       szString = PRVM_G_STRING(OFS_PARM0);
+
+       COM_ToUpperString(szString, szNewString, sizeof(szNewString) );
+
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
+}
+
 /*
 =========
 VM_strcat

diff --git a/prvm_cmds.h b/prvm_cmds.h
index 2ee6ebcae8af21a42222053e5e393b1dd4fb6266..5f1e80a5a2460c0b6980086ee8a284e0b67e5c5e 100644 (file)
--- a/prvm_cmds.h
+++ b/prvm_cmds.h
@@ -291,6 +291,9 @@ void VM_strunzone(void);
 void VM_strlennocol(void);
 // DRESK - Decolorized String
 void VM_strdecolorize(void);
+// DRESK - String Uppercase and Lowercase Support
+void VM_strtolower(void);
+void VM_strtoupper(void);
 
 void VM_clcommand (void);
 

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 1f9fe7fbeaf282ed5051dde7e9a49012b708590e..470b7366e28e938ee3b659dd8070719f04e72324 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -68,6 +68,7 @@ char *vm_sv_extensions =
 "DP_QC_RANDOMVEC "
 "DP_QC_SINCOSSQRTPOW "
 "DP_QC_STRFTIME "
+"DP_QC_STRING_CASE_FUNCTIONS "
 "DP_QC_STRINGBUFFERS "
 "DP_QC_STRINGCOLORFUNCTIONS "
 "DP_QC_TOKENIZEBYSEPARATOR "
@@ -3139,8 +3140,8 @@ VM_strlennocol,                                   // #476 float(string s) : DRESK - String Length (not countin
 VM_strdecolorize,                              // #477 string(string s) : DRESK - Decolorized String (DP_SV_STRINGCOLORFUNCTIONS)
 VM_strftime,                                   // #478 string(float uselocaltime, string format, ...) (DP_QC_STRFTIME)
 VM_tokenizebyseparator,                        // #479 float(string s) tokenizebyseparator (DP_QC_TOKENIZEBYSEPARATOR)
-NULL,                                                  // #480
-NULL,                                                  // #481
+VM_strtolower,                                 // #480 string(string s) VM_strtolower : DRESK - Return string as lowercase
+VM_strtoupper,                                 // #481 string(string s) VM_strtoupper : DRESK - Return string as uppercase
 NULL,                                                  // #482
 NULL,                                                  // #483
 NULL,                                                  // #484