added some commented out code to Image_HeightmapToNormalmap explaining how to do...

[xonotic/darkplaces.git] / pr_exec.c

diff --git a/pr_exec.c b/pr_exec.c
index 7e5388fe24b49847914074ec743098511d61c590..e0421bd98643142c3e7d62d2d16cbf5bcedb8ead 100644 (file)
--- a/pr_exec.c
+++ b/pr_exec.c
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 typedef struct
 {
        int                             s;
-       dfunction_t             *f;
+       mfunction_t             *f;
 } prstack_t;
 
 #define        MAX_STACK_DEPTH         256
@@ -36,8 +36,8 @@ int                   localstack[LOCALSTACK_SIZE];
 int                    localstack_used;
 
 
-qboolean       pr_trace;
-dfunction_t    *pr_xfunction;
+int                    pr_trace;
+mfunction_t    *pr_xfunction;
 int                    pr_xstatement;
 
 
@@ -146,7 +146,7 @@ PR_PrintStatement
 void PR_PrintStatement (dstatement_t *s)
 {
        int             i;
-       
+
        if ( (unsigned)s->op < sizeof(pr_opnames)/sizeof(pr_opnames[0]))
        {
                Con_Printf ("%s ",  pr_opnames[s->op]);
@@ -154,7 +154,7 @@ void PR_PrintStatement (dstatement_t *s)
                for ( ; i<10 ; i++)
                        Con_Printf (" ");
        }
-               
+
        if (s->op == OP_IF || s->op == OP_IFNOT)
                Con_Printf ("%sbranch %i",PR_GlobalString((unsigned short) s->a),s->b);
        else if (s->op == OP_GOTO)
@@ -163,15 +163,15 @@ void PR_PrintStatement (dstatement_t *s)
        }
        else if ( (unsigned)(s->op - OP_STORE_F) < 6)
        {
-               Con_Printf ("%s",PR_GlobalString((unsigned short) s->a));
+               Con_Printf ("%s", PR_GlobalString((unsigned short) s->a));
                Con_Printf ("%s", PR_GlobalStringNoContents((unsigned short) s->b));
        }
        else
        {
                if (s->a)
-                       Con_Printf ("%s",PR_GlobalString((unsigned short) s->a));
+                       Con_Printf ("%s", PR_GlobalString((unsigned short) s->a));
                if (s->b)
-                       Con_Printf ("%s",PR_GlobalString((unsigned short) s->b));
+                       Con_Printf ("%s", PR_GlobalString((unsigned short) s->b));
                if (s->c)
                        Con_Printf ("%s", PR_GlobalStringNoContents((unsigned short) s->c));
        }
@@ -185,7 +185,7 @@ PR_StackTrace
 */
 void PR_StackTrace (void)
 {
-       dfunction_t     *f;
+       mfunction_t     *f;
        int                     i;
 
        pr_stack[pr_depth].s = pr_xstatement;
@@ -197,7 +197,7 @@ void PR_StackTrace (void)
                if (!f)
                        Con_Printf ("<NULL FUNCTION>\n");
                else
-                       Con_Printf ("%12s : %s : statement %i\n", pr_strings + f->s_file, pr_strings + f->s_name, pr_stack[i].s - f->first_statement);
+                       Con_Printf ("%12s : %s : statement %i\n", PR_GetString(f->s_file), PR_GetString(f->s_name), pr_stack[i].s - f->first_statement);
        }
 }
 
@@ -210,11 +210,12 @@ PR_Profile_f
 */
 void PR_Profile_f (void)
 {
-       dfunction_t     *f, *best;
-       int                     max;
-       int                     num;
-       int                     i;
+       mfunction_t *f, *best;
+       int i, num, max/*, howmany*/;
 
+       //howmany = 10;
+       //if (Cmd_Argc() == 2)
+       //      howmany = atoi(Cmd_Argv(1));
        num = 0;
        do
        {
@@ -231,10 +232,11 @@ void PR_Profile_f (void)
                }
                if (best)
                {
-                       if (num < 10)
-                               Con_Printf ("%7i %s\n", best->profile, pr_strings+best->s_name);
+                       //if (num < howmany)
+                               Con_Printf ("%7i %7i %s\n", best->profile, best->builtinsprofile, PR_GetString(best->s_name));
                        num++;
                        best->profile = 0;
+                       best->builtinsprofile = 0;
                }
        } while (best);
 }
@@ -282,7 +284,7 @@ PR_EnterFunction
 Returns the new program statement counter
 ====================
 */
-int PR_EnterFunction (dfunction_t *f)
+int PR_EnterFunction (mfunction_t *f)
 {
        int             i, j, c, o;
 
@@ -348,11 +350,14 @@ int PR_LeaveFunction (void)
        return pr_stack[pr_depth].s;
 }
 
+void PR_ReInitStrings (void);
 void PR_Execute_ProgsLoaded(void)
 {
        // dump the stack
        pr_depth = 0;
        localstack_used = 0;
+       // reset the string table
+       PR_ReInitStrings();
 }
 
 /*
@@ -369,7 +374,7 @@ extern cvar_t pr_traceqc;
 void PR_ExecuteProgram (func_t fnum, const char *errormessage)
 {
        dstatement_t    *st;
-       dfunction_t     *f, *newf;
+       mfunction_t     *f, *newf;
        edict_t *ed;
        eval_t  *ptr;
        int             profile, startprofile, cachedpr_trace, exitdepth;
@@ -424,3 +429,6 @@ chooseexecprogram:
        }
 }
 
+void PR_ReInitStrings (void)
+{
+}