Add NamedRequestScriptPuke to zspecial.acs and update the parameter counts of Request...

[zandronum/zandronum-acc.git] / token.c

diff --git a/token.c b/token.c
index 92284f5..eab9a2c 100644 (file)
--- a/token.c
+++ b/token.c
@@ -183,6 +183,7 @@ static struct keyword_s
        { "wadauthor", TK_WADAUTHOR },\r
        { "nowadauthor", TK_NOWADAUTHOR },\r
        { "acs_executewait", TK_ACSEXECUTEWAIT },\r
+       { "acs_namedexecutewait", TK_ACSNAMEDEXECUTEWAIT },\r
        { "encryptstrings", TK_ENCRYPTSTRINGS },\r
        { "import", TK_IMPORT },\r
        { "library", TK_LIBRARY },\r
@@ -191,8 +192,11 @@ static struct keyword_s
        { "net", TK_NET },\r
        { "clientside", TK_CLIENTSIDE }, // [BB]\r
        { "disconnect", TK_DISCONNECT },\r
+       { "event", TK_EVENT }, //[BB]\r
        { "unloading", TK_UNLOADING },\r
-       { "static", TK_STATIC }\r
+       { "static", TK_STATIC },\r
+       { "strparam", TK_STRPARAM_EVAL }, // [FDARI]\r
+       { "strcpy", TK_STRCPY }, // [FDARI]\r
 };\r
 \r
 #define NUM_KEYWORDS (sizeof(Keywords)/sizeof(Keywords[0]))\r
@@ -332,6 +336,7 @@ void TK_AddIncludePath(char *sourcePath)
                        // Add a directory delimiter to the include path\r
                        strcat(IncludePaths[NumIncludePaths], "/");\r
                }\r
+               MS_Message(MSG_DEBUG, "Add include path %d: \"%s\"\n", NumIncludePaths, IncludePaths[NumIncludePaths]);\r
                NumIncludePaths++;\r
        }\r
 }\r
@@ -349,11 +354,15 @@ void TK_AddProgramIncludePath(char *progname)
        {\r
 #ifdef _WIN32\r
 #ifdef _MSC_VER\r
+#if _MSC_VER >= 1300\r
                if (_get_pgmptr(&progname) != 0)\r
                {\r
                        return;\r
                }\r
 #else\r
+               progname = _pgmptr;\r
+#endif\r
+#else\r
                char progbuff[1024];\r
                GetModuleFileName(0, progbuff, sizeof(progbuff));\r
                progbuff[sizeof(progbuff)-1] = '\0';\r
@@ -369,6 +378,7 @@ void TK_AddProgramIncludePath(char *progname)
                strcpy(IncludePaths[NumIncludePaths], progname);\r
                if(MS_StripFilename(IncludePaths[NumIncludePaths]))\r
                {\r
+                       MS_Message(MSG_DEBUG, "Program include path is %d: \"%s\"\n", NumIncludePaths, IncludePaths[NumIncludePaths]);\r
                        NumIncludePaths++;\r
                }\r
        }\r
@@ -1373,6 +1383,7 @@ static void ProcessSpecialToken(void)
                                        tk_Number = '\r';\r
                                        break;\r
                                case '\'':\r
+                               case '\\':\r
                                        tk_Number = Chr;\r
                                        break;\r
                                default:\r