*** empty log message ***

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

diff --git a/host.c b/host.c
index af56f26aa581573f52585597fb1d9aec3290bd35..90778069bff07192b652a736f9b787807ecb3631 100644 (file)
--- a/host.c
+++ b/host.c
@@ -913,7 +913,7 @@ void Host_Shutdown(void)
        isdown = true;
 
        // Shutdown menu
-       MR_Shutdown;
+       MR_Shutdown();
 
        // AK shutdown PRVM
        // AK hmm, no PRVM_Shutdown(); yet

diff --git a/makefile b/makefile
index b12b941c1cc68b8ad73d5a910610d7d22e9c0cf2..d8479f6e7f6427979899e3b4efb05e440354eb40 100644 (file)
--- a/makefile
+++ b/makefile
@@ -50,7 +50,7 @@ CLIENTOBJECTS=        cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o \
                jpeg.o keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.o \
                r_lerpanim.o r_light.o r_lightning.o r_modules.o r_sky.o \
                r_sprites.o sbar.o ui.o vid_shared.o view.o wavefile.o \
-               r_shadow.o prvm_exec.o prvm_edict.o prvm_cms.o
+                r_shadow.o prvm_exec.o prvm_edict.o prvm_cmds.o
 SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_main.o sv_move.o \
                sv_phys.o sv_user.o
 SHAREDOBJECTS= cmd.o collision.o common.o crc.o cvar.o \

diff --git a/prvm_edict.c b/prvm_edict.c
index ec2f2b18528f5486fde1af593e2d4dc35b7764b8..a55dcffed020db5242864184335c2ca4adc6b701 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -429,16 +429,16 @@ char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val)
        char *s;
        ddef_t *def;
        mfunction_t *f;
-
+       
        type &= ~DEF_SAVEGLOBAL;
-
+       
        switch (type)
        {
        case ev_string:
                // Parse the string a bit to turn special characters
                // (like newline, specifically) into escape codes,
                // this fixes saving games from various mods
-               sprintf (line, "%s", PRVM_GetString(val->string));
+               s = PRVM_GetString (val->string);
                for (i = 0;i < (int)sizeof(line) - 2 && *s;)
                {
                        if (*s == '\n')
@@ -456,33 +456,32 @@ char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val)
                        s++;
                }
                line[i] = '\0';
-               
                break;
        case ev_entity:
-               sprintf (line, "%i", PRVM_NUM_FOR_EDICT(PRVM_PROG_TO_EDICT(val->edict)));
+               snprintf (line, sizeof (line), "%i", PRVM_NUM_FOR_EDICT(PRVM_PROG_TO_EDICT(val->edict)));
                break;
        case ev_function:
                f = pr_functions + val->function;
-               sprintf (line, "%s", PRVM_GetString(f->s_name));
+               snprintf (line, sizeof (line), "%s", PRVM_GetString(f->s_name));
                break;
        case ev_field:
                def = PRVM_ED_FieldAtOfs ( val->_int );
-               s = PRVM_GetString(def->s_name);
+               snprintf (line, sizeof (line), ".%s", PRVM_GetString(def->s_name));
                break;
        case ev_void:
-               sprintf (line, "void");
+               snprintf (line, sizeof (line), "void");
                break;
        case ev_float:
-               sprintf (line, "%f", val->_float);
+               snprintf (line, sizeof (line), "%f", val->_float);
                break;
        case ev_vector:
-               sprintf (line, "%f %f %f", val->vector[0], val->vector[1], val->vector[2]);
+               snprintf (line, sizeof (line), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]);
                break;
        default:
-               sprintf (line, "bad type %i", type);
+               snprintf (line, sizeof (line), "bad type %i", type);
                break;
        }
-
+       
        return line;
 }
 
@@ -1209,7 +1208,7 @@ void PRVM_ResetProg()
        prog->edictstring_mempool = t2;
        prog->edicts_mempool = t3;
 
-       PRVM_GCALL(reset_cmd);
+       PRVM_GCALL(reset_cmd)();
 }
 
 /*