cl_collision: Implement CL_TraceLine_FromViewOrigin

[xonotic/darkplaces.git] / prvm_edict.c

diff --git a/prvm_edict.c b/prvm_edict.c
index 720bd6d17e3e986e98e33212444e3ce8bd593dd7..61649a25f295ead13abe5b1d41343ca7c8394c54 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -457,7 +457,7 @@ static char *PRVM_ValueString (prvm_prog_t *prog, etype_t type, prvm_eval_t *val
                if (def != NULL)
                        dpsnprintf (line, linelength, ".%s", PRVM_GetString(prog, def->s_name));
                else
-                       dpsnprintf (line, linelength, "field%" PRVM_PRIi " (invalid!)", val->_int );
+                       dpsnprintf (line, linelength, "field %" PRVM_PRIi " (invalid!)", val->_int );
                break;
        case ev_void:
                dpsnprintf (line, linelength, "void");
@@ -1382,10 +1382,12 @@ void PRVM_ED_LoadFromFile (prvm_prog_t *prog, const char *data)
 
        prvm_reuseedicts_always_allow = host.realtime;
 
-// parse ents
+       // parse ents
        while (1)
        {
-// parse the opening brace
+               start = data;
+
+               // parse the opening brace
                if (!COM_ParseToken_Simple(&data, false, false, true))
                        break;
                if (com_token[0] != '{')
@@ -1403,7 +1405,7 @@ void PRVM_ED_LoadFromFile (prvm_prog_t *prog, const char *data)
                // clear it
                if (ent != prog->edicts)        // hack
                        memset (ent->fields.fp, 0, prog->entityfields * sizeof(prvm_vec_t));
-               start = data;
+
                data = PRVM_ED_ParseEdict (prog, data, ent);
                parsed++;
 
@@ -2010,8 +2012,6 @@ void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, unsigned char * da
        prog->profiletime = Sys_DirtyTime();
        prog->starttime = host.realtime;
 
-       Con_DPrintf("%s programs occupy %iK.\n", prog->name, (int)(filesize/1024));
-
        requiredglobalspace = 0;
        for (i = 0;i < numrequiredglobals;i++)
                requiredglobalspace += required_global[i].type == ev_vector ? 3 : 1;
@@ -2536,6 +2536,8 @@ fail:
        // init mempools
        PRVM_MEM_Alloc(prog);
 
+       Con_Printf("%s: program loaded (crc %i, size %iK)\n", prog->name, prog->filecrc, (int)(filesize/1024));
+
        // Inittime is at least the time when this function finished. However,
        // later events may bump it.
        prog->inittime = host.realtime;