From 22c9716b56a5d83cf8ce4bf67cf249b150bfd251 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 22 Jul 2001 20:20:46 +0000 Subject: [PATCH] rename int_var to integer_var --- include/QF/progs.h | 6 +- libs/gamecode/pr_edict.c | 14 ++-- libs/gamecode/pr_exec.c | 140 +++++++++++++++++++-------------------- nq/source/pr_cmds.c | 2 +- qw/source/sv_pr_cmds.c | 4 +- 5 files changed, 83 insertions(+), 83 deletions(-) diff --git a/include/QF/progs.h b/include/QF/progs.h index e3a11f112..ddc58a03f 100644 --- a/include/QF/progs.h +++ b/include/QF/progs.h @@ -36,11 +36,11 @@ typedef union pr_type_u { float float_var; - int int_var; string_t string_var; func_t func_var; int entity_var; float vector_var[1]; // really 3, but this structure must be 32 bits + int integer_var; } pr_type_t; #define MAX_ENT_LEAFS 16 @@ -118,7 +118,7 @@ int NUM_FOR_EDICT(progs_t *pr, edict_t *e); #define G_var(p,o,t) ((p)->pr_globals[o].t##_var) #define G_FLOAT(p,o) G_var (p, o, float) -#define G_INT(p,o) G_var (p, o, int) +#define G_INT(p,o) G_var (p, o, integer) #define G_EDICT(p,o) ((edict_t *)(PR_edicts (p) + G_INT (p, o))) #define G_EDICTNUM(p,o) NUM_FOR_EDICT(p, G_EDICT(p, o)) #define G_VECTOR(p,o) G_var (p, o, vector) @@ -128,7 +128,7 @@ int NUM_FOR_EDICT(progs_t *pr, edict_t *e); #define E_var(e,o,t) ((e)->v[o].t##_var) #define E_FLOAT(e,o) E_var (e, o, float) -#define E_INT(e,o) E_var (e, o, int) +#define E_INT(e,o) E_var (e, o, integer) #define E_VECTOR(e,o) E_var (e, o, vector) #define E_STRING(p,e,o) (PR_GetString (p, E_var (e, o, string))) diff --git a/libs/gamecode/pr_edict.c b/libs/gamecode/pr_edict.c index 204cf356b..9cf3a731b 100644 --- a/libs/gamecode/pr_edict.c +++ b/libs/gamecode/pr_edict.c @@ -103,7 +103,7 @@ ED_ClearEdict (progs_t * pr, edict_t *e, int val) if (NUM_FOR_EDICT(pr,e)<*pr->reserved_edicts) printf("clearing reserved edict %d\n", NUM_FOR_EDICT(pr,e)); for (i=0; i < pr->progs->entityfields; i++) - e->v[i].int_var = val; + e->v[i].integer_var = val; //memset (&e->v, 0, pr->progs->entityfields * 4); e->free = false; } @@ -364,7 +364,7 @@ PR_ValueString (progs_t * pr, etype_t type, pr_type_t *val) PR_GetString (pr, f->s_name)); break; case ev_field: - def = ED_FieldAtOfs (pr, val->int_var); + def = ED_FieldAtOfs (pr, val->integer_var); snprintf (line, sizeof (line), ".%s", PR_GetString (pr, def->s_name)); break; @@ -418,7 +418,7 @@ PR_UglyValueString (progs_t * pr, etype_t type, pr_type_t *val) snprintf (line, sizeof (line), "%s", PR_GetString (pr, f->s_name)); break; case ev_field: - def = ED_FieldAtOfs (pr, val->int_var); + def = ED_FieldAtOfs (pr, val->integer_var); snprintf (line, sizeof (line), "%s", PR_GetString (pr, def->s_name)); break; @@ -535,7 +535,7 @@ ED_Print (progs_t * pr, edict_t *ed) type = d->type & ~DEF_SAVEGLOBAL; for (j = 0; j < type_size[type]; j++) - if (v[j].int_var) + if (v[j].integer_var) break; if (j == type_size[type]) continue; @@ -581,7 +581,7 @@ ED_Write (progs_t * pr, VFile *f, edict_t *ed) // if the value is still all 0, skip the field type = d->type & ~DEF_SAVEGLOBAL; for (j = 0; j < type_size[type]; j++) - if (v[j].int_var) + if (v[j].integer_var) break; if (j == type_size[type]) continue; @@ -818,7 +818,7 @@ ED_ParseEpair (progs_t * pr, pr_type_t *base, ddef_t *key, const char *s) Con_Printf ("Can't find field %s\n", s); return false; } - d->int_var = G_INT (pr, def->ofs); + d->integer_var = G_INT (pr, def->ofs); break; case ev_func: @@ -1302,7 +1302,7 @@ PR_InitEdicts (progs_t *pr, int num_edicts) for (j = *pr->reserved_edicts; j < num_edicts; j++) { e = EDICT_NUM (pr, j); for (i=0; i < pr->progs->entityfields; i++) - e->v[i].int_var = 0xdeadbeef; + e->v[i].integer_var = 0xdeadbeef; } } else { memset (edicts, 0, pr->pr_edictareasize); diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c index f2d6dcae5..ec9b80909 100644 --- a/libs/gamecode/pr_exec.c +++ b/libs/gamecode/pr_exec.c @@ -376,46 +376,46 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) OPC.float_var = OPA.float_var < OPB.float_var; break; case OP_AND: // OPA and OPB have to be float for -0.0 - OPC.int_var = OPA.float_var && OPB.float_var; + OPC.integer_var = OPA.float_var && OPB.float_var; break; case OP_OR: // OPA and OPB have to be float for -0.0 - OPC.int_var = OPA.float_var || OPB.float_var; + OPC.integer_var = OPA.float_var || OPB.float_var; break; case OP_NOT_F: - OPC.int_var = !OPA.float_var; + OPC.integer_var = !OPA.float_var; break; case OP_NOT_V: - OPC.int_var = !OPA.vector_var[0] && !OPA.vector_var[1] + OPC.integer_var = !OPA.vector_var[0] && !OPA.vector_var[1] && !OPA.vector_var[2]; break; case OP_NOT_S: - OPC.int_var = !OPA.string_var || !*PR_GetString (pr, OPA.string_var); + OPC.integer_var = !OPA.string_var || !*PR_GetString (pr, OPA.string_var); break; case OP_NOT_FNC: - OPC.int_var = !OPA.func_var; + OPC.integer_var = !OPA.func_var; break; case OP_NOT_ENT: - OPC.int_var = !OPA.entity_var; + OPC.integer_var = !OPA.entity_var; break; case OP_EQ_F: - OPC.int_var = OPA.float_var == OPB.float_var; + OPC.integer_var = OPA.float_var == OPB.float_var; break; case OP_EQ_V: - OPC.int_var = (OPA.vector_var[0] == OPB.vector_var[0]) + OPC.integer_var = (OPA.vector_var[0] == OPB.vector_var[0]) && (OPA.vector_var[1] == OPB.vector_var[1]) && (OPA.vector_var[2] == OPB.vector_var[2]); break; case OP_EQ_E: - OPC.int_var = OPA.int_var == OPB.int_var; + OPC.integer_var = OPA.integer_var == OPB.integer_var; break; case OP_EQ_FNC: - OPC.int_var = OPA.func_var == OPB.func_var; + OPC.integer_var = OPA.func_var == OPB.func_var; break; case OP_NE_F: - OPC.int_var = OPA.float_var != OPB.float_var; + OPC.integer_var = OPA.float_var != OPB.float_var; break; case OP_NE_V: - OPC.int_var = (OPA.vector_var[0] != OPB.vector_var[0]) + OPC.integer_var = (OPA.vector_var[0] != OPB.vector_var[0]) || (OPA.vector_var[1] != OPB.vector_var[1]) || (OPA.vector_var[2] != OPB.vector_var[2]); break; @@ -436,14 +436,14 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) case OP_NE_S: break; case OP_EQ_S: cmp = !cmp; break; } - OPC.int_var = cmp; + OPC.integer_var = cmp; } break; case OP_NE_E: - OPC.int_var = OPA.int_var != OPB.int_var; + OPC.integer_var = OPA.integer_var != OPB.integer_var; break; case OP_NE_FNC: - OPC.int_var = OPA.func_var != OPB.func_var; + OPC.integer_var = OPA.func_var != OPB.func_var; break; // ================== @@ -452,7 +452,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) case OP_STORE_FLD: // integers case OP_STORE_S: case OP_STORE_FNC: // pointers - OPB.int_var = OPA.int_var; + OPB.integer_var = OPA.integer_var; break; case OP_STORE_V: OPB.vector_var[0] = OPA.vector_var[0]; @@ -466,14 +466,14 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) case OP_STOREP_S: case OP_STOREP_FNC: // pointers if (pr_boundscheck->int_val - && (OPB.int_var < 0 || OPB.int_var + 4 > pr->pr_edictareasize)) { + && (OPB.integer_var < 0 || OPB.integer_var + 4 > pr->pr_edictareasize)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs attempted to write to an out of bounds edict\n"); return; } - if (pr_boundscheck->int_val && (OPB.int_var % pr->pr_edict_size < + if (pr_boundscheck->int_val && (OPB.integer_var % pr->pr_edict_size < ((byte *) & (*pr->edicts)->v - (byte *) * pr->edicts))) { pr->pr_xstatement = st - pr->pr_statements; @@ -481,19 +481,19 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) (pr, "Progs attempted to write to an engine edict field\n"); return; } - ptr = (pr_type_t*)((int)*pr->edicts + OPB.int_var); - ptr->int_var = OPA.int_var; + ptr = (pr_type_t*)((int)*pr->edicts + OPB.integer_var); + ptr->integer_var = OPA.integer_var; break; case OP_STOREP_V: if (pr_boundscheck->int_val - && (OPB.int_var < 0 || OPB.int_var + 12 > pr->pr_edictareasize)) { + && (OPB.integer_var < 0 || OPB.integer_var + 12 > pr->pr_edictareasize)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs attempted to write to an out of bounds edict\n"); return; } - ptr = (pr_type_t*)((int)*pr->edicts + OPB.int_var); + ptr = (pr_type_t*)((int)*pr->edicts + OPB.integer_var); ptr->vector_var[0] = OPA.vector_var[0]; ptr->vector_var[1] = OPA.vector_var[1]; ptr->vector_var[2] = OPA.vector_var[2]; @@ -513,7 +513,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) return; } if (pr_boundscheck->int_val - && (OPB.int_var < 0 || OPB.int_var >= pr->progs->entityfields)) { + && (OPB.integer_var < 0 || OPB.integer_var >= pr->progs->entityfields)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, @@ -521,7 +521,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) return; } ed = PROG_TO_EDICT (pr, OPA.entity_var); - OPC.int_var = (int)&ed->v[OPB.int_var] - (int)*pr->edicts; + OPC.integer_var = (int)&ed->v[OPB.integer_var] - (int)*pr->edicts; break; case OP_LOAD_F: case OP_LOAD_FLD: @@ -537,7 +537,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) return; } if (pr_boundscheck->int_val - && (OPB.int_var < 0 || OPB.int_var >= pr->progs->entityfields)) { + && (OPB.integer_var < 0 || OPB.integer_var >= pr->progs->entityfields)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, @@ -545,7 +545,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) return; } ed = PROG_TO_EDICT (pr, OPA.entity_var); - OPC.int_var = ed->v[OPB.int_var].int_var; + OPC.integer_var = ed->v[OPB.integer_var].integer_var; break; case OP_LOAD_V: if (pr_boundscheck->int_val @@ -557,8 +557,8 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) return; } if (pr_boundscheck->int_val - && (OPB.int_var < 0 - || OPB.int_var + 2 >= pr->progs->entityfields)) { + && (OPB.integer_var < 0 + || OPB.integer_var + 2 >= pr->progs->entityfields)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, @@ -566,15 +566,15 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) return; } ed = PROG_TO_EDICT (pr, OPA.entity_var); - memcpy (&OPC, &ed->v[OPB.int_var], 3 * sizeof (OPC)); + memcpy (&OPC, &ed->v[OPB.integer_var], 3 * sizeof (OPC)); break; // ================== case OP_IFNOT: - if (!OPA.int_var) + if (!OPA.integer_var) st += st->b - 1; // offset the s++ break; case OP_IF: - if (OPA.int_var) + if (OPA.integer_var) st += st->b - 1; // offset the s++ break; case OP_GOTO: @@ -624,13 +624,13 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized /* case OP_ADD_I: - OPC.int_var = OPA.int_var + OPB.int_var; + OPC.integer_var = OPA.integer_var + OPB.integer_var; break; case OP_SUB_I: - OPC.int_var = OPA.int_var - OPB.int_var; + OPC.integer_var = OPA.integer_var - OPB.integer_var; break; case OP_MUL_I: - OPC.int_var = OPA.int_var * OPB.int_var; + OPC.integer_var = OPA.integer_var * OPB.integer_var; break; case OP_DIV_VF: { @@ -642,68 +642,68 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) } break; case OP_DIV_I: - OPC.int_var = OPA.int_var / OPB.int_var; + OPC.integer_var = OPA.integer_var / OPB.integer_var; break; case OP_CONV_IF: - OPC.float_var = OPA.int_var; + OPC.float_var = OPA.integer_var; break; case OP_CONV_FI: - OPC.int_var = OPA.float_var; + OPC.integer_var = OPA.float_var; break; case OP_BITAND_I: - OPC.int_var = OPA.int_var & OPB.int_var; + OPC.integer_var = OPA.integer_var & OPB.integer_var; break; case OP_BITOR_I: - OPC.int_var = OPA.int_var | OPB.int_var; + OPC.integer_var = OPA.integer_var | OPB.integer_var; break; case OP_GE_I: - OPC.float_var = OPA.int_var >= OPB.int_var; + OPC.float_var = OPA.integer_var >= OPB.integer_var; break; case OP_LE_I: - OPC.float_var = OPA.int_var <= OPB.int_var; + OPC.float_var = OPA.integer_var <= OPB.integer_var; break; case OP_GT_I: - OPC.float_var = OPA.int_var > OPB.int_var; + OPC.float_var = OPA.integer_var > OPB.integer_var; break; case OP_LT_I: - OPC.float_var = OPA.int_var < OPB.int_var; + OPC.float_var = OPA.integer_var < OPB.integer_var; break; case OP_AND_I: - OPC.float_var = OPA.int_var && OPB.int_var; + OPC.float_var = OPA.integer_var && OPB.integer_var; break; case OP_OR_I: - OPC.float_var = OPA.int_var || OPB.int_var; + OPC.float_var = OPA.integer_var || OPB.integer_var; break; case OP_NOT_I: - OPC.float_var = !OPA.int_var; + OPC.float_var = !OPA.integer_var; break; case OP_EQ_I: - OPC.float_var = OPA.int_var == OPB.int_var; + OPC.float_var = OPA.integer_var == OPB.integer_var; break; case OP_NE_I: - OPC.float_var = OPA.int_var != OPB.int_var; + OPC.float_var = OPA.integer_var != OPB.integer_var; break; case OP_STORE_I: - OPB.int_var = OPA.int_var; + OPB.integer_var = OPA.integer_var; break; case OP_STOREP_I: if (pr_boundscheck->int_val - && (OPB.int_var < 0 || OPB.int_var + 4 > pr->pr_edictareasize)) { + && (OPB.integer_var < 0 || OPB.integer_var + 4 > pr->pr_edictareasize)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs attempted to write to an out of bounds edict\n"); return; } if (pr_boundscheck->int_val - && (OPB.int_var % pr->pr_edict_size < + && (OPB.integer_var % pr->pr_edict_size < ((byte *) & (*pr->edicts)->v - (byte *) *pr->edicts))) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs attempted to write to an engine edict field\n"); return; } - ptr = (eval_t *) ((byte *) *pr->edicts + OPB.int_var); - ptr->int_var = OPA.int_var; + ptr = (eval_t *) ((byte *) *pr->edicts + OPB.integer_var); + ptr->integer_var = OPA.integer_var; break; case OP_LOAD_I: if (pr_boundscheck->int_val @@ -714,14 +714,14 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) return; } if (pr_boundscheck->int_val - && (OPB.int_var < 0 || OPB.int_var >= pr->progs->entityfields)) { + && (OPB.integer_var < 0 || OPB.integer_var >= pr->progs->entityfields)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs attempted to read an invalid field in an entity_var\n"); return; } ed = PROG_TO_EDICT (pr, OPA.entity_var); - OPC.int_var = ((eval_t *) ((int *) &ed->v + OPB.int_var))->int_var; + OPC.integer_var = ((eval_t *) ((int *) &ed->v + OPB.integer_var))->integer_var; break; case OP_GSTOREP_I: @@ -731,29 +731,29 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) case OP_GSTOREP_S: case OP_GSTOREP_FNC: // pointers if (pr_boundscheck->int_val - && (OPB.int_var < 0 || OPB.int_var >= pr->pr_globaldefs)) { + && (OPB.integer_var < 0 || OPB.integer_var >= pr->pr_globaldefs)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs attempted to write to an invalid indexed global\n"); return; } - pr->pr_globals[OPB.int_var] = OPA.float_var; + pr->pr_globals[OPB.integer_var] = OPA.float_var; break; case OP_GSTOREP_V: if (pr_boundscheck->int_val - && (OPB.int_var < 0 || OPB.int_var + 2 >= pr->pr_globaldefs)) { + && (OPB.integer_var < 0 || OPB.integer_var + 2 >= pr->pr_globaldefs)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs attempted to write to an invalid indexed global\n"); return; } - pr->pr_globals[OPB.int_var] = OPA.vector_var[0]; - pr->pr_globals[OPB.int_var + 1] = OPA.vector_var[1]; - pr->pr_globals[OPB.int_var + 2] = OPA.vector_var[2]; + pr->pr_globals[OPB.integer_var] = OPA.vector_var[0]; + pr->pr_globals[OPB.integer_var + 1] = OPA.vector_var[1]; + pr->pr_globals[OPB.integer_var + 2] = OPA.vector_var[2]; break; case OP_GADDRESS: - i = OPA.int_var + (int) OPB.float_var; + i = OPA.integer_var + (int) OPB.float_var; if (pr_boundscheck->int_val && (i < 0 || i >= pr->pr_globaldefs)) { pr->pr_xstatement = st - pr->pr_statements; @@ -771,30 +771,30 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum) case OP_GLOAD_S: case OP_GLOAD_FNC: if (pr_boundscheck->int_val - && (OPA.int_var < 0 || OPA.int_var >= pr->pr_globaldefs)) { + && (OPA.integer_var < 0 || OPA.integer_var >= pr->pr_globaldefs)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs attempted to read an invalid indexed global\n"); return; } - OPC.float_var = pr->pr_globals[OPA.int_var]; + OPC.float_var = pr->pr_globals[OPA.integer_var]; break; case OP_GLOAD_V: if (pr_boundscheck->int_val - && (OPA.int_var < 0 || OPA.int_var + 2 >= pr->pr_globaldefs)) { + && (OPA.integer_var < 0 || OPA.integer_var + 2 >= pr->pr_globaldefs)) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs attempted to read an invalid indexed global\n"); return; } - OPC.vector_var[0] = pr->pr_globals[OPA.int_var]; - OPC.vector_var[1] = pr->pr_globals[OPA.int_var + 1]; - OPC.vector_var[2] = pr->pr_globals[OPA.int_var + 2]; + OPC.vector_var[0] = pr->pr_globals[OPA.integer_var]; + OPC.vector_var[1] = pr->pr_globals[OPA.integer_var + 1]; + OPC.vector_var[2] = pr->pr_globals[OPA.integer_var + 2]; break; case OP_BOUNDCHECK: - if (OPA.int_var < 0 || OPA.int_var >= st->b) { + if (OPA.integer_var < 0 || OPA.integer_var >= st->b) { pr->pr_xstatement = st - pr->pr_statements; PR_RunError (pr, "Progs boundcheck failed at line number %d, value is < 0 or >= %d\n", diff --git a/nq/source/pr_cmds.c b/nq/source/pr_cmds.c index 9d6c299ca..03a7fec77 100644 --- a/nq/source/pr_cmds.c +++ b/nq/source/pr_cmds.c @@ -48,7 +48,7 @@ #include "server.h" #include "sv_progs.h" -#define RETURN_EDICT(p,e) (p->pr_globals[OFS_RETURN].int_var = EDICT_TO_PROG(p, e)) +#define RETURN_EDICT(p,e) (p->pr_globals[OFS_RETURN].integer_var = EDICT_TO_PROG(p, e)) /* =============================================================================== diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c index 84dffe937..6626702ec 100644 --- a/qw/source/sv_pr_cmds.c +++ b/qw/source/sv_pr_cmds.c @@ -45,8 +45,8 @@ #include "world.h" #include "crudefile.h" -#define RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].int_var = EDICT_TO_PROG(p, e)) -#define RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].int_var = PR_SetString((p), s)) +#define RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].integer_var = EDICT_TO_PROG(p, e)) +#define RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].integer_var = PR_SetString((p), s)) /* BUILT-IN FUNCTIONS