Update dpdefs to match current master

diff --git a/qcsrc/dpdefs/upstream/dpextensions.qc b/qcsrc/dpdefs/upstream/dpextensions.qc
index 43dd56cb6a929736f055c4ed000f850d72846f6e..bd1a8dc1573eb4a099c50f72a60ca3ed842560b5 100644 (file)
--- a/qcsrc/dpdefs/upstream/dpextensions.qc
+++ b/qcsrc/dpdefs/upstream/dpextensions.qc
@@ -2619,10 +2619,10 @@ float MOVETYPE_USER_LAST = 191;
 
 //idea: eukara
 //darkplaces implementation: Cloudwalk
-// Do NOT use in production yet.
+//Do NOT use in production yet. Uncomment if you intend to use it
 string __fullspawndata;
 //description:
-// http://icculus.org/finger/marco?date=2019-01-25&time=05-38-02
+//http://icculus.org/finger/marco?date=2019-01-25&time=05-38-02
 
 //DP_QC_FS_SEARCH_PACKFILE
 //idea: Mario

diff --git a/qcsrc/dpdefs/upstream/menudefs.qc b/qcsrc/dpdefs/upstream/menudefs.qc
index 36cedec4f2fdfd1b96e935f1f5f91b84b230fd53..63d2c6388e8447e90e46445abbe65506e93e074b 100644 (file)
--- a/qcsrc/dpdefs/upstream/menudefs.qc
+++ b/qcsrc/dpdefs/upstream/menudefs.qc
@@ -159,7 +159,7 @@ float OS_MAC                = 2;
 //////////////////////////////////////////////////
 // AK FIXME: Create perhaps a special builtin file for the common cmds
 
-void   checkextension(string ext)      = #1;
+float  checkextension(string ext)      = #1;
 
 // error cmds
 void   error(string err,...)           = #2;
@@ -542,7 +542,7 @@ void coverage() = #642;  // Reports a coverage event. The engine counts for each
 //idea: Mario
 //darkplaces implementation: Mario
 //builtin definitions:
-float(string pattern, float caseinsensitive, float quiet, string packfile) search_packfile_begin = #444;
+float(string pattern, float caseinsensitive, float quiet, string packfile) search_packfile_begin = #74;
 //description:
 //extension to search_begin (DP_QC_FS_SEARCH), performs a filename search with the specified pattern (for example "maps/*.bsp") and stores the results in a search slot (minimum of 128 supported by any engine with this extension), the other functions take this returned search slot number, be sure to search_free when done (they are also freed on progs reload).
 //only searches for files within the specified packfile, which is expected to match the results of whichpack().