more tree recovering. This includes Despair's anisotropy support work.

This commit is contained in:
Bill Currie 2005-01-02 14:23:20 +00:00
parent 0029a26f40
commit 23f71485d1
18 changed files with 128 additions and 48 deletions

View file

@ -473,7 +473,7 @@ value_string (progs_t *pr, etype_t type, pr_type_t *val)
break;
case ev_entity:
edict = PROG_TO_EDICT (pr, val->entity_var);
dsprintf (line, "entity %i", NUM_FOR_BAD_EDICT (pr, edict));
dsprintf (line, "entity %ld", NUM_FOR_BAD_EDICT (pr, edict));
break;
case ev_func:
if (val->func_var < 0 || val->func_var >= pr->progs->numfunctions)
@ -640,8 +640,7 @@ PR_PrintStatement (progs_t * pr, dstatement_t *s, int contents)
fmt += 2;
} else {
const char *str;
char mode = fmt[1];
char opchar = fmt[2];
char mode = fmt[1], opchar = fmt[2];
long opval;
etype_t optype;
@ -782,10 +781,9 @@ PR_Profile (progs_t * pr)
void
ED_Print (progs_t *pr, edict_t *ed)
{
int l;
int type, l;
unsigned int i;
const char *name;
int type;
ddef_t *d;
pr_type_t *v;
@ -794,7 +792,7 @@ ED_Print (progs_t *pr, edict_t *ed)
return;
}
Sys_Printf ("\nEDICT %i:\n", NUM_FOR_BAD_EDICT (pr, ed));
Sys_Printf ("\nEDICT %ld:\n", NUM_FOR_BAD_EDICT (pr, ed));
for (i = 0; i < pr->progs->numfielddefs; i++) {
d = &pr->pr_fielddefs[i];
if (!d->s_name) // null field def (probably 1st)

View file

@ -66,8 +66,9 @@ ED_ClearEdict (progs_t *pr, edict_t *e, int val)
{
unsigned int i;
if (NUM_FOR_EDICT(pr,e)<*pr->reserved_edicts)
Sys_Printf("clearing reserved edict %d\n", NUM_FOR_EDICT(pr,e));
if (NUM_FOR_EDICT (pr, e) < *pr->reserved_edicts)
Sys_Printf ("clearing reserved edict %ld\n",
NUM_FOR_EDICT (pr, e));
for (i=0; i < pr->progs->entityfields; i++)
e->v[i].integer_var = val;
e->free = false;

View file

@ -66,7 +66,7 @@ static __attribute__ ((unused)) const char rcsid[] =
static char *
PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val)
{
static char line[256];
static char line[256];
ddef_t *def;
dfunction_t *f;
@ -78,7 +78,7 @@ PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val)
PR_GetString (pr, val->string_var));
break;
case ev_entity:
snprintf (line, sizeof (line), "%i",
snprintf (line, sizeof (line), "%ld",
NUM_FOR_BAD_EDICT (pr, PROG_TO_EDICT (pr, val->entity_var)));
break;
case ev_func: