X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=pr_cmds.c;h=5214f332af82613a62151db44abfc7dcb310d0b0;hb=71c88e4a876a4cfcccf312e3cd4ddbb1ced6d11f;hp=57851749d27c1529518850de7dfe65a59ebf582d;hpb=c70a3e181699c13de9bbaa70171e67e4e3e4b0ba;p=xonotic%2Fdarkplaces.git diff --git a/pr_cmds.c b/pr_cmds.c index 57851749..5214f332 100644 --- a/pr_cmds.c +++ b/pr_cmds.c @@ -70,7 +70,11 @@ void PF_VarString(int first, char *out, int outlength) } char *ENGINE_EXTENSIONS = +"DP_BUTTONCHAT " +"DP_BUTTONUSE " "DP_CL_LOADSKY " +"DP_CON_SET " +"DP_CON_SETA " "DP_EF_ADDITIVE " "DP_EF_BLUE " "DP_EF_FLAME " @@ -126,15 +130,21 @@ char *ENGINE_EXTENSIONS = "DP_QUAKE3_MODEL " "DP_REGISTERCVAR " "DP_SND_DIRECTIONLESSATTNNONE " +"DP_SND_FAKETRACKS " "DP_SND_OGGVORBIS " "DP_SND_STEREOWAV " "DP_SOLIDCORPSE " "DP_SPRITE32 " +"DP_SV_BOTCLIENT " +"DP_SV_CLIENTCOLORS " +"DP_SV_CLIENTNAME " "DP_SV_DRAWONLYTOCLIENT " +"DP_SV_DROPCLIENT " "DP_SV_EFFECT " -"DP_SV_EXTERIORMODELTOCLIENT " "DP_SV_NODRAWTOCLIENT " +"DP_SV_PING " "DP_SV_PLAYERPHYSICS " +"DP_SV_PUNCHVECTOR " "DP_SV_ROTATINGBMODEL " "DP_SV_SETCOLOR " "DP_SV_SLOWMO " @@ -157,6 +167,7 @@ char *ENGINE_EXTENSIONS = "NEH_CMD_PLAY2 " "NEH_RESTOREGAME " "NXQ_GFX_LETTERBOX " +"PRYDON_CLIENTCURSOR " "TENEBRAE_GFX_DLIGHTS " "TW_SV_STEPCONTROL " ; @@ -343,10 +354,10 @@ PF_setmodel setmodel(entity, model) ================= */ +static vec3_t quakemins = {-16, -16, -16}, quakemaxs = {16, 16, 16}; void PF_setmodel (void) { edict_t *e; - char *m, **check; model_t *mod; int i; @@ -355,24 +366,19 @@ void PF_setmodel (void) PF_WARNING("setmodel: can not modify world entity\n"); if (e->e->free) PF_WARNING("setmodel: can not modify free entity\n"); - m = G_STRING(OFS_PARM1); - -// check to see if model was properly precached - for (i=0, check = sv.model_precache ; *check ; i++, check++) - if (!strcmp(*check, m)) - break; - - if (!*check) - PF_WARNING(va("setmodel: no precache for model \"%s\"\n", m)); - - - e->v->model = PR_SetString(*check); + i = SV_ModelIndex(G_STRING(OFS_PARM1), 1); + e->v->model = PR_SetString(sv.model_precache[i]); e->v->modelindex = i; - mod = sv.models[ (int)e->v->modelindex]; + mod = sv.models[i]; if (mod) - SetMinMaxSize (e, mod->normalmins, mod->normalmaxs, true); + { + if (mod->type != mod_alias || sv_gameplayfix_setmodelrealbox.integer) + SetMinMaxSize (e, mod->normalmins, mod->normalmaxs, true); + else + SetMinMaxSize (e, quakemins, quakemaxs, true); + } else SetMinMaxSize (e, vec3_origin, vec3_origin, true); } @@ -417,8 +423,6 @@ void PF_sprint (void) } client = svs.clients + entnum-1; - if (!client->netconnection) - return; PF_VarString(1, string, sizeof(string)); MSG_WriteChar(&client->message,svc_print); MSG_WriteString(&client->message, string); @@ -449,8 +453,6 @@ void PF_centerprint (void) } client = svs.clients + entnum-1; - if (!client->netconnection) - return; PF_VarString(1, string, sizeof(string)); MSG_WriteChar(&client->message,svc_centerprint); MSG_WriteString(&client->message, string); @@ -590,11 +592,7 @@ random() */ void PF_random (void) { - float num; - - num = (rand ()&0x7fff) / ((float)0x7fff); - - G_FLOAT(OFS_RETURN) = num; + G_FLOAT(OFS_RETURN) = lhrandom(0, 1); } /* @@ -626,7 +624,6 @@ PF_ambientsound */ void PF_ambientsound (void) { - char **check; char *samp; float *pos; float vol, attenuation; @@ -638,15 +635,9 @@ void PF_ambientsound (void) attenuation = G_FLOAT(OFS_PARM3); // check to see if samp was properly precached - for (soundnum=0, check = sv.sound_precache ; *check ; check++, soundnum++) - if (!strcmp(*check,samp)) - break; - - if (!*check) - { - Con_Printf("no precache: %s\n", samp); + soundnum = SV_SoundIndex(samp, 1); + if (!soundnum) return; - } large = false; if (soundnum >= 256) @@ -978,8 +969,8 @@ void PF_stuffcmd (void) str = G_STRING(OFS_PARM1); old = host_client; - if ((host_client = svs.clients + entnum-1) && host_client->netconnection) - Host_ClientCommands ("%s", str); + host_client = svs.clients + entnum-1; + Host_ClientCommands ("%s", str); host_client = old; } @@ -1356,59 +1347,17 @@ void PF_precache_file (void) G_INT(OFS_RETURN) = G_INT(OFS_PARM0); } + void PF_precache_sound (void) { - char *s; - int i; - int limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_SOUNDS); - - if (sv.state != ss_loading) - PF_ERROR("PF_Precache_*: Precache can only be done in spawn functions"); - - s = G_STRING(OFS_PARM0); + SV_SoundIndex(G_STRING(OFS_PARM0), 2); G_INT(OFS_RETURN) = G_INT(OFS_PARM0); - PR_CheckEmptyString (s); - - for (i=0 ; ibrush.ishlbsp && ((!s) || (!s[0]))) - return; + SV_ModelIndex(G_STRING(OFS_PARM0), 2); G_INT(OFS_RETURN) = G_INT(OFS_PARM0); - PR_CheckEmptyString (s); - - for (i = 0;i < limit;i++) - { - if (!sv.model_precache[i]) - { - sv.model_precache[i] = s; - sv.models[i] = Mod_ForName (s, true, false, false); - return; - } - if (!strcmp(sv.model_precache[i], s)) - return; - } - PF_ERROR("PF_precache_model: overflow"); } @@ -1544,7 +1493,7 @@ void PF_lightstyle (void) for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) { - if (client->netconnection) + if (client->active) { MSG_WriteChar (&client->message, svc_lightstyle); MSG_WriteChar (&client->message,style); @@ -2218,15 +2167,21 @@ void PF_setcolor (void) } client = svs.clients + entnum-1; - if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors))) - val->_float = i; + if (client->edict) + { + if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors))) + val->_float = i; + client->edict->v->team = (i & 15) + 1; + } client->colors = i; - client->old_colors = i; - client->edict->v->team = (i & 15) + 1; - - MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); - MSG_WriteByte (&sv.reliable_datagram, entnum - 1); - MSG_WriteByte (&sv.reliable_datagram, i); + if (client->old_colors != client->colors) + { + client->old_colors = client->colors; + // send notification to all clients + MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); + MSG_WriteByte (&sv.reliable_datagram, client - svs.clients); + MSG_WriteByte (&sv.reliable_datagram, client->colors); + } } /* @@ -2244,8 +2199,8 @@ void PF_effect (void) if (!s || !s[0]) PF_WARNING("effect: no model specified\n"); - i = SV_ModelIndex(s); - if (i < 0) + i = SV_ModelIndex(s, 1); + if (!i) PF_WARNING("effect: model not precached\n"); SV_StartEffect(G_VECTOR(OFS_PARM0), i, G_FLOAT(OFS_PARM2), G_FLOAT(OFS_PARM3), G_FLOAT(OFS_PARM4)); } @@ -3134,26 +3089,15 @@ void PF_setattachment (void) ///////////////////////////////////////// // DP_MD3_TAGINFO extension coded by VorteX -//float(entity ent, string tagname) gettagindex; -void PF_gettagindex (void) +int SV_GetTagIndex (edict_t *e, char *tagname) { - edict_t *e = G_EDICT(OFS_PARM0); - const char *tagname = G_STRING(OFS_PARM1); - int modelindex, tagindex, i; + int tagindex, i; model_t *model; - if (e == sv.edicts) - PF_WARNING("gettagindex: can't affect world entity\n"); - if (e->e->free) - PF_WARNING("gettagindex: can't affect free entity\n"); - - modelindex = (int)e->v->modelindex; - if (modelindex <= 0 || modelindex > MAX_MODELS) - { - Con_DPrintf("gettagindex(entity #%i): null or non-precached model\n", NUM_FOR_EDICT(e)); - return; - } - model = sv.models[modelindex]; + i = e->v->modelindex; + if (i < 1 || i >= MAX_MODELS) + return -1; + model = sv.models[i]; tagindex = -1; if (model->data_overridetagnamesforskin && (unsigned int)e->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)e->v->skin].num_overridetagnames) @@ -3178,9 +3122,7 @@ void PF_gettagindex (void) } } } - if (tagindex == -1) - Con_DPrintf("gettagindex(entity #%i): tag \"%s\" not found\n", NUM_FOR_EDICT(e), tagname); - G_FLOAT(OFS_RETURN) = tagindex + 1; + return tagindex + 1; }; // Warnings/errors code: @@ -3189,12 +3131,16 @@ void PF_gettagindex (void) // 2 - free entity // 3 - null or non-precached model // 4 - no tags with requested index +// 5 - runaway loop at attachment chain +extern cvar_t cl_bob; +extern cvar_t cl_bobcycle; +extern cvar_t cl_bobup; int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex) { eval_t *val; - float scale; - int modelindex, tagsnum, reqframe; - matrix4x4_t entitymatrix, tagmatrix; + int modelindex, reqtag, reqframe, attachloop; + matrix4x4_t entitymatrix, tagmatrix, attachmatrix; + edict_t *attachent; model_t *model; Matrix4x4_CreateIdentity(out); // warnings and errors return identical matrix @@ -3209,74 +3155,153 @@ int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex) return 3; model = sv.models[modelindex]; - tagsnum = model->alias.aliasnum_tags; + reqtag = model->alias.aliasnum_tags; - if (tagindex <= 0 || tagindex > tagsnum) + if (tagindex <= 0 || tagindex > reqtag) { - if (tagsnum && tagindex) // Only appear if model has no tags or not-null tag requested + if (reqtag && tagindex) // Only appear if model has no tags or not-null tag requested return 4; return 0; } if (ent->v->frame < 0 || ent->v->frame > model->alias.aliasnum_tagframes) - reqframe = 0; // if model has wrong frame, engine automatically switches to model first frame + reqframe = model->numframes - 1; // if model has wrong frame, engine automatically switches to model last frame else reqframe = ent->v->frame; - // just reusing a temp - modelindex = (tagindex - 1) + ent->v->frame*tagsnum; + // get initial tag matrix + if (tagindex) + { + reqtag = (tagindex - 1) + ent->v->frame*model->alias.aliasnum_tags; + Matrix4x4_Copy(&tagmatrix, &model->alias.aliasdata_tags[reqtag].matrix); + } + else + Matrix4x4_CreateIdentity(&tagmatrix); - // transform tag by its own entity matrix - Matrix4x4_Copy(&tagmatrix, &model->alias.aliasdata_tags[modelindex].matrix); - // FIXME: add scale parameter - scale = 1; + if ((val = GETEDICTFIELDVALUE(ent, eval_tag_entity)) && val->edict) + { // DP_GFX_QUAKE3MODELTAGS, scan all chain and stop on unattached entity + attachloop = 0; + do + { + attachent = EDICT_NUM(val->edict); // to this it entity our entity is attached + val = GETEDICTFIELDVALUE(ent, eval_tag_index); + Matrix4x4_CreateIdentity(&attachmatrix); + if (val->_float >= 1 && attachent->v->modelindex >= 1 && attachent->v->modelindex < MAX_MODELS) + { + model = sv.models[(int)attachent->v->modelindex]; + if (val->_float < model->alias.aliasnum_tags) + { + // got tagname on parent entity attachment tag via tag_index (and got it's matrix) + model = sv.models[(int)attachent->v->modelindex]; + reqtag = (val->_float - 1) + attachent->v->frame*model->alias.aliasnum_tags; + Matrix4x4_Copy(&attachmatrix, &model->alias.aliasdata_tags[reqtag].matrix); + } + } + + // apply transformation by child entity matrix + val = GETEDICTFIELDVALUE(ent, eval_scale); + if (val->_float == 0) + val->_float = 1; + Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], -ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], val->_float); + Matrix4x4_Concat(out, &entitymatrix, &tagmatrix); + out->m[0][3] = entitymatrix.m[0][3] + val->_float*(entitymatrix.m[0][0]*tagmatrix.m[0][3] + entitymatrix.m[0][1]*tagmatrix.m[1][3] + entitymatrix.m[0][2]*tagmatrix.m[2][3]); + out->m[1][3] = entitymatrix.m[1][3] + val->_float*(entitymatrix.m[1][0]*tagmatrix.m[0][3] + entitymatrix.m[1][1]*tagmatrix.m[1][3] + entitymatrix.m[1][2]*tagmatrix.m[2][3]); + out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]); + Matrix4x4_Copy(&tagmatrix, out); + + // finally transformate by matrix of tag on parent entity + Matrix4x4_Concat(out, &attachmatrix, &tagmatrix); + out->m[0][3] = attachmatrix.m[0][3] + attachmatrix.m[0][0]*tagmatrix.m[0][3] + attachmatrix.m[0][1]*tagmatrix.m[1][3] + attachmatrix.m[0][2]*tagmatrix.m[2][3]; + out->m[1][3] = attachmatrix.m[1][3] + attachmatrix.m[1][0]*tagmatrix.m[0][3] + attachmatrix.m[1][1]*tagmatrix.m[1][3] + attachmatrix.m[1][2]*tagmatrix.m[2][3]; + out->m[2][3] = attachmatrix.m[2][3] + attachmatrix.m[2][0]*tagmatrix.m[0][3] + attachmatrix.m[2][1]*tagmatrix.m[1][3] + attachmatrix.m[2][2]*tagmatrix.m[2][3]; + Matrix4x4_Copy(&tagmatrix, out); + + ent = attachent; + attachloop += 1; + if (attachloop > 255) // prevent runaway looping + return 5; + } + while ((val = GETEDICTFIELDVALUE(ent, eval_tag_entity)) && val->edict); + } + + // normal or RENDER_VIEWMODEL entity (or main parent entity on attach chain) + val = GETEDICTFIELDVALUE(ent, eval_scale); + if (val->_float == 0) + val->_float = 1; // Alias models have inverse pitch, bmodels can't have tags, so don't check for modeltype... - Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], -ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], scale); + Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], -ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], val->_float); Matrix4x4_Concat(out, &entitymatrix, &tagmatrix); - // True origin for rotation (Matrix4x4_Concat creates wrong), this is done using all rotation matrix - out->m[0][3] = entitymatrix.m[0][3] + scale*tagmatrix.m[0][3]*(entitymatrix.m[0][0] + entitymatrix.m[0][1] + entitymatrix.m[0][2]); - out->m[1][3] = entitymatrix.m[1][3] + scale*tagmatrix.m[1][3]*(entitymatrix.m[1][0] + entitymatrix.m[1][1] + entitymatrix.m[1][2]); - out->m[2][3] = entitymatrix.m[2][3] + scale*tagmatrix.m[2][3]*(entitymatrix.m[2][0] + entitymatrix.m[2][1] + entitymatrix.m[2][2]); - /* Optimised variant with only v_forward using - out->m[0][3] = entitymatrix.m[0][3] + scale*entitymatrix.m[0][0]*tagmatrix.m[0][3]; - out->m[1][3] = entitymatrix.m[1][3] + scale*entitymatrix.m[1][0]*tagmatrix.m[1][3]; - out->m[2][3] = entitymatrix.m[2][3] + scale*entitymatrix.m[2][0]*tagmatrix.m[2][3]; - */ - - // additional actions for render-view entities + out->m[0][3] = entitymatrix.m[0][3] + val->_float*(entitymatrix.m[0][0]*tagmatrix.m[0][3] + entitymatrix.m[0][1]*tagmatrix.m[1][3] + entitymatrix.m[0][2]*tagmatrix.m[2][3]); + out->m[1][3] = entitymatrix.m[1][3] + val->_float*(entitymatrix.m[1][0]*tagmatrix.m[0][3] + entitymatrix.m[1][1]*tagmatrix.m[1][3] + entitymatrix.m[1][2]*tagmatrix.m[2][3]); + out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]); + if ((val = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)) && val->edict) - {// RENDER_VIEWMODEL + {// RENDER_VIEWMODEL magic + Matrix4x4_Copy(&tagmatrix, out); ent = EDICT_NUM(val->edict); - // FIXME: "circle" bug, add bobbing (cl_bob), add scale parameter - scale = 1; - Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2] + ent->v->view_ofs[2], ent->v->v_angle[0], ent->v->v_angle[1], ent->v->v_angle[2], scale); - Matrix4x4_Concat(out, &entitymatrix, out); - out->m[0][3] = entitymatrix.m[0][3] + scale*entitymatrix.m[0][0]*out->m[0][3]; - out->m[1][3] = entitymatrix.m[1][3] + scale*entitymatrix.m[1][0]*out->m[1][3]; - out->m[2][3] = entitymatrix.m[2][3] + scale*entitymatrix.m[2][0]*out->m[2][3]; - Con_DPrintf("SV_GetTagMatrix: returned origin is %f %f %f\n", out->m[0][3], out->m[1][3], out->m[2][3]); - return 0; - } - // RENDER_VIEWMODEL can't be attached by tag, right? - val = GETEDICTFIELDVALUE(ent, eval_tag_entity); - if (val->edict) - {// DP_GFX_QUAKE3MODELTAGS - do + + val = GETEDICTFIELDVALUE(ent, eval_scale); + if (val->_float == 0) + val->_float = 1; + + Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2] + ent->v->view_ofs[2], ent->v->v_angle[0], ent->v->v_angle[1], ent->v->v_angle[2], val->_float); + Matrix4x4_Concat(out, &entitymatrix, &tagmatrix); + out->m[0][3] = entitymatrix.m[0][3] + val->_float*(entitymatrix.m[0][0]*tagmatrix.m[0][3] + entitymatrix.m[0][1]*tagmatrix.m[1][3] + entitymatrix.m[0][2]*tagmatrix.m[2][3]); + out->m[1][3] = entitymatrix.m[1][3] + val->_float*(entitymatrix.m[1][0]*tagmatrix.m[0][3] + entitymatrix.m[1][1]*tagmatrix.m[1][3] + entitymatrix.m[1][2]*tagmatrix.m[2][3]); + out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]); + + /* + // Cl_bob, ported from rendering code + if (ent->v->health > 0 && cl_bob.value && cl_bobcycle.value) { - ent = EDICT_NUM(val->edict); - // FIXME: add scale parameter - Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], -ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], scale); - Matrix4x4_Concat(out, &entitymatrix, &tagmatrix); - // True origin for rotation (Matrix4x4_Concat creates wrong), this is done using all rotation matrix - out->m[0][3] = entitymatrix.m[0][3] + scale*tagmatrix.m[0][3]*(entitymatrix.m[0][0] + entitymatrix.m[0][1] + entitymatrix.m[0][2]); - out->m[1][3] = entitymatrix.m[1][3] + scale*tagmatrix.m[1][3]*(entitymatrix.m[1][0] + entitymatrix.m[1][1] + entitymatrix.m[1][2]); - out->m[2][3] = entitymatrix.m[2][3] + scale*tagmatrix.m[2][3]*(entitymatrix.m[2][0] + entitymatrix.m[2][1] + entitymatrix.m[2][2]); + double bob, cycle; + // LordHavoc: this code is *weird*, but not replacable (I think it + // should be done in QC on the server, but oh well, quake is quake) + // LordHavoc: figured out bobup: the time at which the sin is at 180 + // degrees (which allows lengthening or squishing the peak or valley) + cycle = sv.time/cl_bobcycle.value; + cycle -= (int)cycle; + if (cycle < cl_bobup.value) + cycle = sin(M_PI * cycle / cl_bobup.value); + else + cycle = sin(M_PI + M_PI * (cycle-cl_bobup.value)/(1.0 - cl_bobup.value)); + // bob is proportional to velocity in the xy plane + // (don't count Z, or jumping messes it up) + bob = sqrt(ent->v->velocity[0]*ent->v->velocity[0] + ent->v->velocity[1]*ent->v->velocity[1])*cl_bob.value; + bob = bob*0.3 + bob*0.7*cycle; + out->m[2][3] += bound(-7, bob, 4); } - while ((val = GETEDICTFIELDVALUE(ent, eval_tag_entity)) && val->edict); + */ } return 0; } +//float(entity ent, string tagname) gettagindex; + +void PF_gettagindex (void) +{ + edict_t *ent = G_EDICT(OFS_PARM0); + char *tag_name = G_STRING(OFS_PARM1); + int modelindex, tag_index; + + if (ent == sv.edicts) + PF_WARNING("gettagindex: can't affect world entity\n"); + if (ent->e->free) + PF_WARNING("gettagindex: can't affect free entity\n"); + + modelindex = (int)ent->v->modelindex; + tag_index = 0; + if (modelindex <= 0 || modelindex > MAX_MODELS) + Con_DPrintf("gettagindex(entity #%i): null or non-precached model\n", NUM_FOR_EDICT(ent)); + else + { + tag_index = SV_GetTagIndex(ent, tag_name); + if (tag_index == 0) + Con_DPrintf("gettagindex(entity #%i): tag \"%s\" not found\n", NUM_FOR_EDICT(ent), tag_name); + } + G_FLOAT(OFS_RETURN) = tag_index; +}; + //vector(entity ent, float tagindex) gettaginfo; void PF_gettaginfo (void) { @@ -3302,6 +3327,9 @@ void PF_gettaginfo (void) case 4: Con_DPrintf("SV_GetTagMatrix(entity #%i): model has no tag with requested index %i\n", NUM_FOR_EDICT(e), tagindex); break; + case 5: + Con_DPrintf("SV_GetTagMatrix(entity #%i): runaway loop at attachment chain\n", NUM_FOR_EDICT(e)); + break; } } @@ -3476,7 +3504,56 @@ void PF_cvar_string (void) G_INT(OFS_RETURN) = PR_SetString(tmp); } +//void(entity clent) dropclient (DP_SV_DROPCLIENT) +void PF_dropclient (void) +{ + int clientnum; + client_t *oldhostclient; + clientnum = G_EDICTNUM(OFS_PARM0) - 1; + if (clientnum < 0 || clientnum >= svs.maxclients) + PF_WARNING("dropclient: not a client\n"); + if (!svs.clients[clientnum].active) + PF_WARNING("dropclient: that client slot is not connected\n"); + oldhostclient = host_client; + host_client = svs.clients + clientnum; + SV_DropClient(false); + host_client = oldhostclient; +} +//entity() spawnclient (DP_SV_BOTCLIENT) +void PF_spawnclient (void) +{ + int i; + edict_t *ed; + pr_xfunction->builtinsprofile += 2; + ed = sv.edicts; + for (i = 0;i < svs.maxclients;i++) + { + if (!svs.clients[i].active) + { + pr_xfunction->builtinsprofile += 100; + SV_ConnectClient (i, NULL); + ed = EDICT_NUM(i + 1); + break; + } + } + RETURN_EDICT(ed); +} + +//float(entity clent) clienttype (DP_SV_BOTCLIENT) +void PF_clienttype (void) +{ + int clientnum; + clientnum = G_EDICTNUM(OFS_PARM0) - 1; + if (clientnum < 0 || clientnum >= svs.maxclients) + G_FLOAT(OFS_RETURN) = 3; + else if (!svs.clients[clientnum].active) + G_FLOAT(OFS_RETURN) = 0; + else if (svs.clients[clientnum].netconnection) + G_FLOAT(OFS_RETURN) = 1; + else + G_FLOAT(OFS_RETURN) = 2; +} builtin_t pr_builtin[] = { @@ -3521,7 +3598,7 @@ PF_floor, // #37 float(float v) floor PF_ceil, // #38 float(float v) ceil NULL, // #39 PF_checkbottom, // #40 float(entity e) checkbottom -PF_pointcontents , // #41 float(vector v) pointcontents +PF_pointcontents, // #41 float(vector v) pointcontents NULL, // #42 PF_fabs, // #43 float(float f) fabs PF_aim, // #44 vector(entity e, float speed) aim @@ -3648,18 +3725,18 @@ PF_clientcommand, // #440 void(entity e, string s) clientcommand (KRIMZON_SV_P PF_tokenize, // #441 float(string s) tokenize (KRIMZON_SV_PARSECLIENTCOMMAND) PF_argv, // #442 string(float n) argv (KRIMZON_SV_PARSECLIENTCOMMAND) PF_setattachment, // #443 void(entity e, entity tagentity, string tagname) setattachment (DP_GFX_QUAKE3MODELTAGS) -PF_search_begin, // #444 -PF_search_end, // #445 -PF_search_getsize, // #446 -PF_search_getfilename, // #447 +PF_search_begin, // #444 float(string pattern, float caseinsensitive, float quiet) search_begin (DP_FS_SEARCH) +PF_search_end, // #445 void(float handle) search_end (DP_FS_SEARCH) +PF_search_getsize, // #446 float(float handle) search_getsize (DP_FS_SEARCH) +PF_search_getfilename, // #447 string(float handle, float num) search_getfilename (DP_FS_SEARCH) PF_cvar_string, // #448 string(string s) cvar_string (DP_QC_CVAR_STRING) PF_findflags, // #449 entity(entity start, .float fld, float match) findflags (DP_QC_FINDFLAGS) PF_findchainflags, // #450 entity(.float fld, float match) findchainflags (DP_QC_FINDCHAINFLAGS) PF_gettagindex, // #451 float(entity ent, string tagname) gettagindex (DP_QC_GETTAGINFO) PF_gettaginfo, // #452 vector(entity ent, float tagindex) gettaginfo (DP_QC_GETTAGINFO) -NULL, // #453 -NULL, // #454 -NULL, // #455 +PF_dropclient, // #453 void(entity clent) dropclient (DP_SV_DROPCLIENT) +PF_spawnclient, // #454 entity() spawnclient (DP_SV_BOTCLIENT) +PF_clienttype, // #455 float(entity clent) clienttype (DP_SV_BOTCLIENT) NULL, // #456 NULL, // #457 NULL, // #458