Added a new builin function (callfunction)

Fixed my drawqueue clipping code - should work now

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

diff --git a/common.c b/common.c
index 01609278a47f8ef414966328b4906505719ef877..e56f200bef9b69fcdb58d85e93cc94614b138f0d 100644 (file)
--- a/common.c
+++ b/common.c
@@ -547,8 +547,9 @@ skipwhite:
                // skip /* comments
                if (data[1] == '*')
                {
-                       while (*data && *data != '*' && data[1] != '/')
+                       while (*data && (*data != '*' || data[1] != '/'))
                                data++;
+                       data+=2;
                        goto skipwhite;
                }
        }

diff --git a/fs.c b/fs.c
index 8518c93db5045f6ac99260ba88624e016587fb17..1b028e228630c39746453a88491525104044bd7d 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -982,7 +982,8 @@ qfile_t *FS_FOpenFile (const char *filename, qboolean quiet)
 
        filenamelen = strlen (filename);
 
-#ifdef AKVERSION               
+#ifdef AKVERSION
+       // first we search for a real file, after that we start to search through the paks
        // search through the path, one element at a time
        search = fs_searchpaths;
 

diff --git a/gl_backend.c b/gl_backend.c
index cb450bde6c68950a1a817ce2d2e6f92af2241031..7769bbc430db1d198a9fa1b06ac282406c2cd3de 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -609,7 +609,7 @@ void GL_LockArrays(int first, int count)
 void GL_Scissor (int x, int y, int width, int height)
 {
        CHECKGLERROR
-       qglScissor(x, vid.realheight - (y + height),width,height);      
+       qglScissor(x, vid.realheight - (y + height),width,height);
        CHECKGLERROR
 }
 

diff --git a/gl_draw.c b/gl_draw.c
index f0905e98d787051e07beeef4f25cb349902b1a04..7ba2282e38eb8bc0eff765055c6a3e6abd87ff38 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -511,11 +511,11 @@ void R_DrawQueue(void)
                        {
                                // We have to convert the con coords into real coords
                                int x , y, width, height;
-                               x = dq->x * (vid.realwidth / vid.conwidth) + vid.realx;
+                               x = dq->x * ((float)vid.realwidth / vid.conwidth);
                                // OGL uses top to bottom 
-                               y = (dq->y + dq->scaley) * (vid.realheight / vid.conheight) + vid.realy;
-                               width = dq->scalex * (vid.realwidth / vid.conwidth);
-                               height = dq->scaley * (vid.realheight / vid.conheight);
+                               y = dq->y * ((float) vid.realheight / vid.conheight);
+                               width = dq->scalex * ((float)vid.realwidth / vid.conwidth);
+                               height = dq->scaley * ((float)vid.realheight / vid.conheight);
 
                                GL_Scissor(x, y, width, height);
 

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 0b4fb015b32a5798be9b43617e7dceb41420e548..f587ce6b816ccfd07804112df83a08b167fa0312 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -122,6 +122,9 @@ menu cmd list:
 float  getkeydest
                setmousetarget(float target)
 float  getmousetarget(void)
+
+               callfunction(...,string function_name)
+               writetofile(float fhandle, entity ent)
 */
 
 #include "quakedef.h"
@@ -154,9 +157,9 @@ mempool_t *vm_strings_mempool[PRVM_MAXPROGS];
 
 // temp string handling
 // LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
-#define STRINGTEMP_BUFFERS 16
-#define STRINGTEMP_LENGTH 4096
-static char vm_string_temp[STRINGTEMP_BUFFERS][STRINGTEMP_LENGTH];
+#define VM_STRINGTEMP_BUFFERS 16
+#define VM_STRINGTEMP_LENGTH 4096
+static char vm_string_temp[VM_STRINGTEMP_BUFFERS][VM_STRINGTEMP_LENGTH];
 static int vm_string_tempindex = 0;
 
 // qc cvar 
@@ -175,7 +178,7 @@ static char *VM_GetTempString(void)
 {
        char *s;
        s = vm_string_temp[vm_string_tempindex];
-       vm_string_tempindex = (vm_string_tempindex + 1) % STRINGTEMP_BUFFERS;
+       vm_string_tempindex = (vm_string_tempindex + 1) % VM_STRINGTEMP_BUFFERS;
        return s;
 }
 
@@ -259,7 +262,7 @@ error(value)
 void VM_error (void)
 {
        prvm_edict_t    *ed;
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_VarString(0, string, sizeof(string));
        Con_Printf ("======%S ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
@@ -285,7 +288,7 @@ objerror(value)
 void VM_objerror (void)
 {
        prvm_edict_t    *ed;
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_VarString(0, string, sizeof(string));
        Con_Printf ("======%s OBJECT ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
@@ -312,7 +315,7 @@ print(string)
 */
 void VM_print (void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_VarString(0, string, sizeof(string));
        Con_Print(string);
@@ -329,7 +332,7 @@ bprint(...[string])
 */
 void VM_bprint (void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        if(!sv.active)
        {
@@ -354,7 +357,7 @@ void VM_sprint (void)
 {
        client_t        *client;
        int                     clientnum;
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        //find client for this entity
        clientnum = PRVM_G_FLOAT(OFS_PARM0);
@@ -383,7 +386,7 @@ centerprint(clientent, value)
 */
 void VM_centerprint (void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_VarString(0, string, sizeof(string));
        SCR_CenterPrint(string);
@@ -680,7 +683,7 @@ dprint(...[string])
 */
 void VM_dprint (void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
        if (developer.integer)
        {
                VM_VarString(0, string, sizeof(string));
@@ -778,7 +781,7 @@ float stof(...[string])
 */
 void VM_stof(void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
        VM_VarString(0, string, sizeof(string));
        PRVM_G_FLOAT(OFS_RETURN) = atof(string);
 }
@@ -1698,7 +1701,7 @@ string    fgets(float fhandle)
 void VM_fgets(void)
 {
        int c, end;
-       static char string[STRINGTEMP_LENGTH];
+       static char string[VM_STRINGTEMP_LENGTH];
        int filenum;
 
        VM_SAFEPARMCOUNT(1,VM_fgets);
@@ -1720,7 +1723,7 @@ void VM_fgets(void)
                c = FS_Getc(VM_FILES[filenum]);
                if (c == '\r' || c == '\n' || c < 0)
                        break;
-               if (end < STRINGTEMP_LENGTH - 1)
+               if (end < VM_STRINGTEMP_LENGTH - 1)
                        string[end++] = c;
        }
        string[end] = 0;
@@ -1746,7 +1749,7 @@ fputs(float fhandle, string s)
 void VM_fputs(void)
 {
        int stringlength;
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
        int filenum;
 
        VM_SAFEPARMCOUNT(2,VM_fputs);
@@ -1808,7 +1811,7 @@ void VM_strcat(void)
                PRVM_ERROR("VM_strcat wrong parameter count (min. 2 expected ) !\n");
        
        s = VM_GetTempString();
-       VM_VarString(0, s, STRINGTEMP_LENGTH);
+       VM_VarString(0, s, VM_STRINGTEMP_LENGTH);
        PRVM_G_INT(OFS_RETURN) = PRVM_SetString(s);
 }
 
@@ -1835,7 +1838,7 @@ void VM_substring(void)
        if (!s)
                s = "";
        for (i = 0;i < start && *s;i++, s++);
-       for (i = 0;i < STRINGTEMP_LENGTH - 1 && *s && i < length;i++, s++)
+       for (i = 0;i < VM_STRINGTEMP_LENGTH - 1 && *s && i < length;i++, s++)
                string[i] = *s;
        string[i] = 0;
        PRVM_G_INT(OFS_RETURN) = PRVM_SetString(string);
@@ -1851,7 +1854,7 @@ vector    stov(string s)
 //vector(string s) stov = #117; // returns vector value from a string
 void VM_stov(void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_SAFEPARMCOUNT(1,VM_stov);
 
@@ -2439,8 +2442,8 @@ void VM_drawsetcliparea(void)
 
        x = bound(0,PRVM_G_FLOAT(OFS_PARM0),vid.conwidth);
        y = bound(0,PRVM_G_FLOAT(OFS_PARM1),vid.conheight);
-       w = bound(0,PRVM_G_FLOAT(OFS_PARM2),x);
-       h = bound(0,PRVM_G_FLOAT(OFS_PARM3),y); 
+       w = bound(0,PRVM_G_FLOAT(OFS_PARM2),(vid.conwidth  - x));
+       h = bound(0,PRVM_G_FLOAT(OFS_PARM3),(vid.conheight - y)); 
 
        DrawQ_SetClipArea(x,y,w,h);
 }
@@ -2648,6 +2651,69 @@ void VM_M_getkeydest(void)
        }
 }
 
+/*
+=========
+VM_M_callfunction
+
+       callfunction(...,string function_name)
+=========
+*/
+mfunction_t *PRVM_ED_FindFunction (const char *name);
+int PRVM_EnterFunction (mfunction_t *f);
+void VM_M_callfunction(void)
+{
+       mfunction_t *func;
+       char *s;
+
+       s = PRVM_G_STRING(OFS_PARM0 + (prog->argc - 1));
+
+       if(!s)
+               PRVM_ERROR("VM_M_getfunction: null string !\n");
+
+       VM_CheckEmptyString(s); 
+
+       func = PRVM_ED_FindFunction(s);
+
+       if(func)
+               PRVM_EnterFunction(func);
+}      
+
+/*
+=========
+VM_M_writetofile
+
+       writetofile(float fhandle, entity ent)
+=========
+*/
+void VM_M_writetofile(void)
+{
+       prvm_edict_t * ent;
+       int filenum;
+
+       VM_SAFEPARMCOUNT(2, VM_M_writetofile);
+
+       filenum = PRVM_G_FLOAT(OFS_PARM0);
+       if (filenum < 0 || filenum >= MAX_VMFILES)
+       {
+               Con_Printf("VM_fputs: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
+               return;
+       }
+       if (VM_FILES[filenum] == NULL)
+       {
+               Con_Printf("VM_fputs: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
+               return;
+       }
+
+       ent = PRVM_G_EDICT(OFS_PARM1);  
+       if(ent->e->free)
+       {
+               Con_Printf("VM_M_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_EDICT_NUM(OFS_PARM1));
+               return;
+       }
+
+       PRVM_ED_Write (VM_FILES[filenum], ent);
+}
+
 prvm_builtin_t vm_m_builtins[] = {
        0, // to be consistent with the old vm
        // common builtings (mostly)
@@ -2762,7 +2828,9 @@ prvm_builtin_t vm_m_builtins[] = {
        VM_M_setkeydest,
        VM_M_getkeydest,
        VM_M_setmousetarget,
-       VM_M_getmousetarget
+       VM_M_getmousetarget,
+       VM_M_callfunction,
+       VM_M_writetofile        // 606
 };
 
 const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t);

diff --git a/prvm_edict.c b/prvm_edict.c
index 5ed79417cc76206b2aafe645bc0a559f96ef5134..1bf6e847d85bfab4a73666299e39ac20a7f2efad 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -225,7 +225,7 @@ prvm_edict_t *PRVM_ED_Alloc (void)
                e = PRVM_EDICT_NUM(i);
                // the first couple seconds of server time can involve a lot of
                // freeing and allocating, so relax the replacement policy
-               if (e->e->free && ( e->e->freetime < 2 || *prog->time - e->e->freetime > 0.5 ) )
+               if (e->e->free && ( e->e->freetime < 2 || (*prog->time - e->e->freetime) > 0.5 ) )
                {
                        PRVM_ED_ClearEdict (e);
                        return e;
@@ -255,6 +255,10 @@ FIXME: walk all entities and NULL out references to this entity
 */
 void PRVM_ED_Free (prvm_edict_t *ed)
 {
+       // dont delete the null entity (world)
+       if(PRVM_NUM_FOR_EDICT(ed) == 0)
+               return;
+
        PRVM_GCALL(free_edict)(ed);
 
        ed->e->free = true;

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index 51240d7258dee9a1f773cf0db93ec798fcb97922..0d2246ecefa70c435e502ce137537a067b02320d 100644 (file)
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -90,7 +90,7 @@
                                OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2];
                                break;
                        case OP_NOT_S:
-                               OPC->_float = !OPA->string || !*PR_GetString(OPA->string);
+                               OPC->_float = !OPA->string || !*PRVM_GetString(OPA->string);
                                break;
                        case OP_NOT_FNC:
                                OPC->_float = !OPA->function;