X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=pr_cmds.c;h=af9475985224d36d2fb8c906abc5c0cb19e53a07;hp=354cf937c2bf82075db8f20558e7b5c88ae047bc;hb=fb01b14cb91a3537fcde574a7c9574032f33f347;hpb=d1986a0cb01eaeab540d54fde3e8a9f8128ce3c2 diff --git a/pr_cmds.c b/pr_cmds.c index 354cf937..af947598 100644 --- a/pr_cmds.c +++ b/pr_cmds.c @@ -75,6 +75,7 @@ char *ENGINE_EXTENSIONS = "DP_EF_BLUE " "DP_EF_FLAME " "DP_EF_FULLBRIGHT " +"DP_EF_NODEPTHTEST " "DP_EF_NODRAW " "DP_EF_NOSHADOW " "DP_EF_RED " @@ -94,6 +95,7 @@ char *ENGINE_EXTENSIONS = "DP_HALFLIFE_MAP " "DP_HALFLIFE_MAP_CVAR " "DP_INPUTBUTTONS " +"DP_LITSPRITES " "DP_LITSUPPORT " "DP_MONSTERWALK " "DP_MOVETYPEBOUNCEMISSILE " @@ -110,6 +112,7 @@ char *ENGINE_EXTENSIONS = "DP_QC_FS_SEARCH " // Black: same as in the menu qc "DP_QC_GETLIGHT " "DP_QC_GETSURFACE " +"DP_QC_GETTAGINFO " "DP_QC_MINMAXBOUND " "DP_QC_MULTIPLETEMPSTRINGS " "DP_QC_RANDOMVEC " @@ -128,6 +131,7 @@ char *ENGINE_EXTENSIONS = "DP_SOLIDCORPSE " "DP_SPRITE32 " "DP_SV_DRAWONLYTOCLIENT " +"DP_SV_DROPCLIENT " "DP_SV_EFFECT " "DP_SV_EXTERIORMODELTOCLIENT " "DP_SV_NODRAWTOCLIENT " @@ -153,6 +157,7 @@ char *ENGINE_EXTENSIONS = "KRIMZON_SV_PARSECLIENTCOMMAND " "NEH_CMD_PLAY2 " "NEH_RESTOREGAME " +"NXQ_GFX_LETTERBOX " "TENEBRAE_GFX_DLIGHTS " "TW_SV_STEPCONTROL " ; @@ -359,7 +364,7 @@ void PF_setmodel (void) break; if (!*check) - PF_WARNING("setmodel: no precache\n"); + PF_WARNING(va("setmodel: no precache for model \"%s\"\n", m)); e->v->model = PR_SetString(*check); @@ -522,7 +527,7 @@ void PF_vectoyaw (void) yaw = 0; else { - yaw = (int) (atan2(value1[1], value1[0]) * 180 / M_PI); + yaw = (atan2(value1[1], value1[0]) * 180 / M_PI); if (yaw < 0) yaw += 360; } @@ -1029,37 +1034,46 @@ findradius (origin, radius) void PF_findradius (void) { edict_t *ent, *chain; - float radius; - float radius2; - float *org; - float eorg[3]; + vec_t radius, radius2; + vec3_t org, eorg, mins, maxs; int i; + int numtouchedicts; + edict_t *touchedicts[MAX_EDICTS]; chain = (edict_t *)sv.edicts; - org = G_VECTOR(OFS_PARM0); + VectorCopy(G_VECTOR(OFS_PARM0), org); radius = G_FLOAT(OFS_PARM1); radius2 = radius * radius; - ent = NEXT_EDICT(sv.edicts); - for (i=1 ; i MAX_EDICTS) + { + // this never happens + Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS); + numtouchedicts = MAX_EDICTS; + } + for (i = 0;i < numtouchedicts;i++) { + ent = touchedicts[i]; pr_xfunction->builtinsprofile++; - if (ent->e->free) - continue; - if (ent->v->solid == SOLID_NOT) - continue; - - // LordHavoc: compare against bounding box rather than center, - // and use DotProduct instead of Length, major speedup + // LordHavoc: compare against bounding box rather than center so it + // doesn't miss large objects, and use DotProduct instead of Length + // for a major speedup eorg[0] = (org[0] - ent->v->origin[0]) - bound(ent->v->mins[0], (org[0] - ent->v->origin[0]), ent->v->maxs[0]); eorg[1] = (org[1] - ent->v->origin[1]) - bound(ent->v->mins[1], (org[1] - ent->v->origin[1]), ent->v->maxs[1]); eorg[2] = (org[2] - ent->v->origin[2]) - bound(ent->v->mins[2], (org[2] - ent->v->origin[2]), ent->v->maxs[2]); - if (DotProduct(eorg, eorg) > radius2) - continue; - - ent->v->chain = EDICT_TO_PROG(chain); - chain = ent; + if (DotProduct(eorg, eorg) < radius2) + { + ent->v->chain = EDICT_TO_PROG(chain); + chain = ent; + } } RETURN_EDICT(chain); @@ -1628,7 +1642,10 @@ void PF_aim (void) float speed; // assume failure if it returns early - VectorClear(G_VECTOR(OFS_RETURN)); + VectorCopy(pr_global_struct->v_forward, G_VECTOR(OFS_RETURN)); + // if sv_aim is so high it can't possibly accept anything, skip out early + if (sv_aim.value >= 1) + return; ent = G_EDICT(OFS_PARM0); if (ent == sv.edicts) @@ -1873,10 +1890,7 @@ void PF_WriteLong (void) void PF_WriteAngle (void) { - if (sv.protocol == PROTOCOL_DARKPLACES5) - MSG_WriteAngle16i (WriteDest(), G_FLOAT(OFS_PARM1)); - else - MSG_WriteAngle8i (WriteDest(), G_FLOAT(OFS_PARM1)); + MSG_WriteAngle (WriteDest(), G_FLOAT(OFS_PARM1), sv.protocol); } void PF_WriteCoord (void) @@ -1930,7 +1944,7 @@ void PF_makestatic (void) for (i=0 ; i<3 ; i++) { MSG_WriteCoord(&sv.signon, ent->v->origin[i], sv.protocol); - MSG_WriteAngle8i(&sv.signon, ent->v->angles[i]); + MSG_WriteAngle(&sv.signon, ent->v->angles[i], sv.protocol); } // throw the entity away now @@ -2044,17 +2058,13 @@ void PF_GetLight (void) VectorMA(ambientcolor, 0.5, diffusecolor, G_VECTOR(OFS_RETURN)); } -#define MAX_QC_CVARS 128 -cvar_t qc_cvar[MAX_QC_CVARS]; -int currentqc_cvar; - void PF_registercvar (void) { char *name, *value; - cvar_t *variable; name = G_STRING(OFS_PARM0); value = G_STRING(OFS_PARM1); G_FLOAT(OFS_RETURN) = 0; + // first check to see if it has already been defined if (Cvar_FindVar (name)) return; @@ -2066,18 +2076,8 @@ void PF_registercvar (void) return; } - if (currentqc_cvar >= MAX_QC_CVARS) - PF_ERROR("PF_registercvar: ran out of cvar slots\n"); - -// copy the name and value - variable = &qc_cvar[currentqc_cvar++]; - variable->name = Z_Malloc (strlen(name)+1); - strcpy (variable->name, name); - variable->string = Z_Malloc (strlen(value)+1); - strcpy (variable->string, value); - variable->value = atof (value); + Cvar_Get(name, value, 0); - Cvar_RegisterVariable(variable); G_FLOAT(OFS_RETURN) = 1; // success } @@ -2219,15 +2219,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); + } } /* @@ -3132,6 +3138,177 @@ void PF_setattachment (void) } } +///////////////////////////////////////// +// DP_MD3_TAGINFO extension coded by VorteX + +//float(entity ent, string tagname) gettagindex; +void PF_gettagindex (void) +{ + edict_t *e = G_EDICT(OFS_PARM0); + const char *tagname = G_STRING(OFS_PARM1); + int modelindex, 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]; + + 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) + { + for (i = 0; i < model->data_overridetagnamesforskin[(unsigned int)e->v->skin].num_overridetagnames; i++) + { + if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)e->v->skin].data_overridetagnames[i].name)) + { + tagindex = i; + break; + } + } + } + if (tagindex == -1) + { + for (i = 0;i < model->alias.aliasnum_tags; i++) + { + if (!(strcmp(tagname, model->alias.aliasdata_tags[i].name))) + { + tagindex = i; + break; + } + } + } + if (tagindex == -1) + Con_DPrintf("gettagindex(entity #%i): tag \"%s\" not found\n", NUM_FOR_EDICT(e), tagname); + G_FLOAT(OFS_RETURN) = tagindex + 1; +}; + +// Warnings/errors code: +// 0 - normal (everything all-right) +// 1 - world entity +// 2 - free entity +// 3 - null or non-precached model +// 4 - no tags with requested index +int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex) +{ + eval_t *val; + float scale; + int modelindex, tagsnum, reqframe; + matrix4x4_t entitymatrix, tagmatrix; + model_t *model; + + Matrix4x4_CreateIdentity(out); // warnings and errors return identical matrix + + if (ent == sv.edicts) + return 1; + if (ent->e->free) + return 2; + + modelindex = (int)ent->v->modelindex; + if (modelindex <= 0 || modelindex > MAX_MODELS) + return 3; + + model = sv.models[modelindex]; + tagsnum = model->alias.aliasnum_tags; + + if (tagindex <= 0 || tagindex > tagsnum) + { + if (tagsnum && 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 + else + reqframe = ent->v->frame; + + // just reusing a temp + modelindex = (tagindex - 1) + ent->v->frame*tagsnum; + + // transform tag by its own entity matrix + Matrix4x4_Copy(&tagmatrix, &model->alias.aliasdata_tags[modelindex].matrix); + // FIXME: add scale parameter + scale = 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_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] + 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] + 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] + entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]; + + // additional actions for render-view entities + if ((val = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)) && val->edict) + {// RENDER_VIEWMODEL + Matrix4x4_Copy(&tagmatrix, out); + ent = EDICT_NUM(val->edict); + // FIXME: 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, &tagmatrix); + out->m[0][3] = entitymatrix.m[0][3] + 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] + 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] + entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.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 + { + 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] + 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] + 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] + entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]; + + } + while ((val = GETEDICTFIELDVALUE(ent, eval_tag_entity)) && val->edict); + } + return 0; +} + +//vector(entity ent, float tagindex) gettaginfo; +void PF_gettaginfo (void) +{ + edict_t *e = G_EDICT(OFS_PARM0); + int tagindex = (int)G_FLOAT(OFS_PARM1); + matrix4x4_t tag_matrix; + int returncode; + + returncode = SV_GetTagMatrix(&tag_matrix, e, tagindex); + Matrix4x4_ToVectors(&tag_matrix, pr_global_struct->v_forward, pr_global_struct->v_right, pr_global_struct->v_up, G_VECTOR(OFS_RETURN)); + + switch(returncode) + { + case 1: + PF_WARNING("gettagindex: can't affect world entity\n"); + break; + case 2: + PF_WARNING("gettagindex: can't affect free entity\n"); + break; + case 3: + Con_DPrintf("SV_GetTagMatrix(entity #%i): null or non-precached model\n", NUM_FOR_EDICT(e)); + break; + case 4: + Con_DPrintf("SV_GetTagMatrix(entity #%i): model has no tag with requested index %i\n", NUM_FOR_EDICT(e), tagindex); + break; + } +} + ///////////////////////////////////////// // DP_QC_FS_SEARCH extension @@ -3293,13 +3470,31 @@ void PF_cvar_string (void) str = G_STRING(OFS_PARM0); var = Cvar_FindVar (str); - - tmp = PR_GetTempString(); - strcpy(tmp, var->string); - + if (var) + { + tmp = PR_GetTempString(); + strcpy(tmp, var->string); + } + else + tmp = ""; 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; +} builtin_t pr_builtin[] = @@ -3479,9 +3674,9 @@ PF_search_getfilename, // #447 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) -NULL, // #451 -NULL, // #452 -NULL, // #453 +PF_gettagindex, // #451 float(entity ent, string tagname) gettagindex (DP_QC_GETTAGINFO) +PF_gettaginfo, // #452 vector(entity ent, float tagindex) gettaginfo (DP_QC_GETTAGINFO) +PF_dropclient, // #453 void(entity clent) dropclient (DP_SV_DROPCLIENT) NULL, // #454 NULL, // #455 NULL, // #456