nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-10 22:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleaned up a bit, made more generic and stuph.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@511 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-11-23 00:35:37 +00:00
parent 2d54b24930
commit 64e5dd682f
1 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
engine/server/pr_cmds.c
View file

@ -1321,8 +1321,8 @@ void VARGS PR_BIError(progfuncs_t *progfuncs, char *format, ...)
} }
else else
{ {
PR_StackTrace(progfuncs); progfuncs->PR_StackTrace(progfuncs);
PR_AbortStack(progfuncs); progfuncs->AbortStack(progfuncs);
progfuncs->parms->Abort ("%s", string); progfuncs->parms->Abort ("%s", string);
} }
} }
@ -1564,7 +1564,7 @@ void PF_error (progfuncs_t *prinst, struct globalvars_s *pr_globals)
ED_Print (ed); ED_Print (ed);
*/ */
PR_StackTrace(prinst); prinst->PR_StackTrace(prinst);
Con_Printf("%s\n", s); Con_Printf("%s\n", s);
@ -1612,7 +1612,7 @@ void PF_objerror (progfuncs_t *prinst, struct globalvars_s *pr_globals)
prinst->AbortStack(prinst); prinst->AbortStack(prinst);
PR_BIError ("Program error :%s", s); PR_BIError (prinst, "Program error: %s", s);
if (sv.time > 10) if (sv.time > 10)
Cbuf_AddText("restart\n", RESTRICT_LOCAL); Cbuf_AddText("restart\n", RESTRICT_LOCAL);
@ -4781,7 +4781,6 @@ void PF_multicast (progfuncs_t *prinst, struct globalvars_s *pr_globals)
static void PF_Fixme (progfuncs_t *prinst, struct globalvars_s *pr_globals) static void PF_Fixme (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
progfuncs_t *progfuncs = prinst;
int i; int i;
qboolean printedheader = false; qboolean printedheader = false;
@ -4803,9 +4802,9 @@ qboolean printedheader = false;
Con_Printf("\n"); Con_Printf("\n");
if (progstype == PROG_QW) if (progstype == PROG_QW)
PR_RunError(prinst, "\nBuiltin %i not implemented.\nMods designed for mvdsv may need pr_imitatemvdsv to be enabled.", prinst->lastcalledbuiltinnumber); prinst->PR_RunError(prinst, "\nBuiltin %i not implemented.\nMods designed for mvdsv may need pr_imitatemvdsv to be enabled.", prinst->lastcalledbuiltinnumber);
else else
PR_RunError(prinst, "\nBuiltin %i not implemented.\nMod is not compatable.", prinst->lastcalledbuiltinnumber); prinst->PR_RunError(prinst, "\nBuiltin %i not implemented.\nMod is not compatable.", prinst->lastcalledbuiltinnumber);
PR_BIError (prinst, "bulitin not implemented"); PR_BIError (prinst, "bulitin not implemented");
} }
@ -6208,14 +6207,14 @@ void PF_findchain (progfuncs_t *prinst, struct globalvars_s *pr_globals)
char *s, *t; char *s, *t;
edict_t *ent, *chain; edict_t *ent, *chain;
chain = (edict_t *) sv.edicts; chain = (edict_t *) *prinst->parms->sv_edicts;
f = G_INT(OFS_PARM0)+prinst->fieldadjust; f = G_INT(OFS_PARM0)+prinst->fieldadjust;
s = PR_GetStringOfs(prinst, OFS_PARM1); s = PR_GetStringOfs(prinst, OFS_PARM1);
for (i = 1; i < sv.num_edicts; i++) for (i = 1; i < *prinst->parms->sv_num_edicts; i++)
{ {
ent = EDICT_NUM(svprogfuncs, i); ent = EDICT_NUM(prinst, i);
if (ent->isfree) if (ent->isfree)
continue; continue;
t = *(string_t *)&((float*)&ent->v)[f] + prinst->stringtable; t = *(string_t *)&((float*)&ent->v)[f] + prinst->stringtable;
@ -6241,17 +6240,18 @@ void PF_findchainfloat (progfuncs_t *prinst, struct globalvars_s *pr_globals)
float s; float s;
edict_t *ent, *chain; edict_t *ent, *chain;
chain = (edict_t *) sv.edicts; chain = (edict_t *) *prinst->parms->sv_edicts;
f = G_INT(OFS_PARM0)+prinst->fieldadjust; f = G_INT(OFS_PARM0)+prinst->fieldadjust;
f += prinst->parms->edictsize/4;
s = G_FLOAT(OFS_PARM1); s = G_FLOAT(OFS_PARM1);
for (i = 1; i < sv.num_edicts; i++) for (i = 1; i < *prinst->parms->sv_num_edicts; i++)
{ {
ent = EDICT_NUM(svprogfuncs, i); ent = EDICT_NUM(prinst, i);
if (ent->isfree) if (ent->isfree)
continue; continue;
if (((float *)&ent->v)[f] != s) if (((float *)ent)[f] != s)
continue; continue;
ent->v.chain = EDICT_TO_PROG(prinst, chain); ent->v.chain = EDICT_TO_PROG(prinst, chain);
@ -6271,17 +6271,18 @@ void PF_findchainflags (progfuncs_t *prinst, struct globalvars_s *pr_globals)
int s; int s;
edict_t *ent, *chain; edict_t *ent, *chain;
chain = (edict_t *) sv.edicts; chain = (edict_t *) *prinst->parms->sv_edicts;
f = G_INT(OFS_PARM0)+prinst->fieldadjust; f = G_INT(OFS_PARM0)+prinst->fieldadjust;
f += prinst->parms->edictsize/4;
s = G_FLOAT(OFS_PARM1); s = G_FLOAT(OFS_PARM1);
for (i = 1; i < sv.num_edicts; i++) for (i = 1; i < *prinst->parms->sv_num_edicts; i++)
{ {
ent = EDICT_NUM(svprogfuncs, i); ent = EDICT_NUM(prinst, i);
if (ent->isfree) if (ent->isfree)
continue; continue;
if (!((int)((float *)&ent->v)[f] & s)) if (!((int)((float *)ent)[f] & s))
continue; continue;
ent->v.chain = EDICT_TO_PROG(prinst, chain); ent->v.chain = EDICT_TO_PROG(prinst, chain);
@ -6297,7 +6298,7 @@ void PF_findchainflags (progfuncs_t *prinst, struct globalvars_s *pr_globals)
void PF_FindFloat (progfuncs_t *prinst, struct globalvars_s *pr_globals) void PF_FindFloat (progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
int e, f; int e, f;
float s; int s;
edict_t *ed; edict_t *ed;
if (*prinst->callargc != 3) //I can hate mvdsv if I want to. if (*prinst->callargc != 3) //I can hate mvdsv if I want to.
@ -6309,14 +6310,14 @@ void PF_FindFloat (progfuncs_t *prinst, struct globalvars_s *pr_globals)
e = G_EDICTNUM(prinst, OFS_PARM0); e = G_EDICTNUM(prinst, OFS_PARM0);
f = G_INT(OFS_PARM1)+prinst->fieldadjust; f = G_INT(OFS_PARM1)+prinst->fieldadjust;
f += prinst->parms->edictsize/4; f += prinst->parms->edictsize/4;
s = G_FLOAT(OFS_PARM2); s = G_INT(OFS_PARM2);
for (e++; e < *prinst->parms->sv_num_edicts; e++) for (e++; e < *prinst->parms->sv_num_edicts; e++)
{ {
ed = EDICT_NUM(prinst, e); ed = EDICT_NUM(prinst, e);
if (ed->isfree) if (ed->isfree)
continue; continue;
if (((float *)ed)[f] == s) if (((int *)ed)[f] == s)
{ {
RETURN_EDICT(prinst, ed); RETURN_EDICT(prinst, ed);
return; return;
@ -6337,21 +6338,22 @@ void PF_FindFlags (progfuncs_t *prinst, struct globalvars_s *pr_globals)
e = G_EDICTNUM(prinst, OFS_PARM0); e = G_EDICTNUM(prinst, OFS_PARM0);
f = G_INT(OFS_PARM1)+prinst->fieldadjust; f = G_INT(OFS_PARM1)+prinst->fieldadjust;
f += prinst->parms->edictsize/4;
s = G_FLOAT(OFS_PARM2); s = G_FLOAT(OFS_PARM2);
for (e++; e < sv.num_edicts; e++) for (e++; e < *prinst->parms->sv_num_edicts; e++)
{ {
ed = EDICT_NUM(prinst, e); ed = EDICT_NUM(prinst, e);
if (ed->isfree) if (ed->isfree)
continue; continue;
if ((int)((float *)&ed->v)[f] & s) if ((int)((float *)ed)[f] & s)
{ {
RETURN_EDICT(prinst, ed); RETURN_EDICT(prinst, ed);
return; return;
} }
} }
RETURN_EDICT(prinst, sv.edicts); RETURN_EDICT(prinst, *prinst->parms->sv_edicts);
} }
@ -7382,7 +7384,6 @@ static void ParamNegateFix ( float * xx, float * yy, int Zone )
} }
void PF_ShowPic(progfuncs_t *prinst, struct globalvars_s *pr_globals) void PF_ShowPic(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
progfuncs_t *progfuncs = prinst;
char *slot = PR_GetStringOfs(prinst, OFS_PARM0); char *slot = PR_GetStringOfs(prinst, OFS_PARM0);
char *picname = PR_GetStringOfs(prinst, OFS_PARM1); char *picname = PR_GetStringOfs(prinst, OFS_PARM1);
float x = G_FLOAT(OFS_PARM2); float x = G_FLOAT(OFS_PARM2);
@ -7398,7 +7399,7 @@ void PF_ShowPic(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ //to a single client { //to a single client
entnum = G_EDICTNUM(prinst, OFS_PARM5)-1; entnum = G_EDICTNUM(prinst, OFS_PARM5)-1;
if (entnum < 0 || entnum >= sv.allocated_client_slots) if (entnum < 0 || entnum >= sv.allocated_client_slots)
PR_RunError (prinst, "WriteDest: not a client"); prinst->PR_RunError (prinst, "WriteDest: not a client");
if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC)) if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC))
return; //need an extension for this. duh. return; //need an extension for this. duh.
@ -7432,7 +7433,7 @@ void PF_HidePic(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ //to a single client { //to a single client
entnum = G_EDICTNUM(prinst, OFS_PARM1)-1; entnum = G_EDICTNUM(prinst, OFS_PARM1)-1;
if (entnum < 0 || entnum >= sv.allocated_client_slots) if (entnum < 0 || entnum >= sv.allocated_client_slots)
PR_RunError (prinst, "WriteDest: not a client"); prinst->PR_RunError (prinst, "WriteDest: not a client");
if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC)) if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC))
return; //need an extension for this. duh. return; //need an extension for this. duh.
@ -7468,7 +7469,7 @@ void PF_MovePic(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ //to a single client { //to a single client
entnum = G_EDICTNUM(prinst, OFS_PARM4)-1; entnum = G_EDICTNUM(prinst, OFS_PARM4)-1;
if (entnum < 0 || entnum >= sv.allocated_client_slots) if (entnum < 0 || entnum >= sv.allocated_client_slots)
PR_RunError (prinst, "WriteDest: not a client"); prinst->PR_RunError (prinst, "WriteDest: not a client");
if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC)) if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC))
return; //need an extension for this. duh. return; //need an extension for this. duh.
@ -7502,7 +7503,7 @@ void PF_ChangePic(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{ //to a single client { //to a single client
entnum = G_EDICTNUM(prinst, OFS_PARM2)-1; entnum = G_EDICTNUM(prinst, OFS_PARM2)-1;
if (entnum < 0 || entnum >= sv.allocated_client_slots) if (entnum < 0 || entnum >= sv.allocated_client_slots)
PR_RunError (prinst, "WriteDest: not a client"); prinst->PR_RunError (prinst, "WriteDest: not a client");
if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC)) if (!(svs.clients[entnum].fteprotocolextensions & PEXT_SHOWPIC))
return; //need an extension for this. duh. return; //need an extension for this. duh.