X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=svvm_cmds.c;h=a9d50af10c50008f3640642f8e8ac0a622eda71e;hb=fdc2140da5dc11b2970915454a4202968bed4381;hp=5b99fc904d4bc992335128f46b9895dcb42f092f;hpb=012fcbea8f2b462fbc14f154224dd0606fce37ec;p=xonotic%2Fdarkplaces.git diff --git a/svvm_cmds.c b/svvm_cmds.c index 5b99fc90..a9d50af1 100644 --- a/svvm_cmds.c +++ b/svvm_cmds.c @@ -8,228 +8,232 @@ -const char *vm_sv_extensions = -"BX_WAL_SUPPORT " -"DP_BUTTONCHAT " -"DP_BUTTONUSE " -"DP_CL_LOADSKY " -"DP_CON_ALIASPARAMETERS " -"DP_CON_BESTWEAPON " -"DP_CON_EXPANDCVAR " -"DP_CON_SET " -"DP_CON_SETA " -"DP_CON_STARTMAP " -"DP_COVERAGE " -"DP_CRYPTO " -"DP_CSQC_BINDMAPS " -"DP_CSQC_ENTITYWORLDOBJECT " -"DP_CSQC_ENTITYMODELLIGHT " -"DP_CSQC_ENTITYTRANSPARENTSORTING_OFFSET " -"DP_CSQC_MAINVIEW " -"DP_CSQC_MINFPS_QUALITY " -"DP_CSQC_MULTIFRAME_INTERPOLATION " -"DP_CSQC_BOXPARTICLES " -"DP_CSQC_SPAWNPARTICLE " -"DP_CSQC_QUERYRENDERENTITY " -"DP_CSQC_ROTATEMOVES " -"DP_CSQC_SETPAUSE " -"DP_CSQC_V_CALCREFDEF_WIP1 " -"DP_CSQC_V_CALCREFDEF_WIP2 " -"DP_EF_ADDITIVE " -"DP_EF_BLUE " -"DP_EF_DOUBLESIDED " -"DP_EF_DYNAMICMODELLIGHT " -"DP_EF_FLAME " -"DP_EF_FULLBRIGHT " -"DP_EF_NODEPTHTEST " -"DP_EF_NODRAW " -"DP_EF_NOGUNBOB " -"DP_EF_NOSELFSHADOW " -"DP_EF_NOSHADOW " -"DP_EF_RED " -"DP_EF_RESTARTANIM_BIT " -"DP_EF_STARDUST " -"DP_EF_TELEPORT_BIT " -"DP_ENT_ALPHA " -"DP_ENT_COLORMOD " -"DP_ENT_CUSTOMCOLORMAP " -"DP_ENT_EXTERIORMODELTOCLIENT " -"DP_ENT_GLOW " -"DP_ENT_GLOWMOD " -"DP_ENT_LOWPRECISION " -"DP_ENT_SCALE " -"DP_ENT_TRAILEFFECTNUM " -"DP_ENT_VIEWMODEL " -"DP_GFX_EXTERNALTEXTURES " -"DP_GFX_EXTERNALTEXTURES_PERMAP " -"DP_GFX_FOG " -"DP_GFX_MODEL_INTERPOLATION " -"DP_GFX_QUAKE3MODELTAGS " -"DP_GFX_SKINFILES " -"DP_GFX_SKYBOX " -"DP_GFX_FONTS " -"DP_GFX_FONTS_FREETYPE " -"DP_UTF8 " -"DP_FONT_VARIABLEWIDTH " -"DP_HALFLIFE_MAP " -"DP_HALFLIFE_MAP_CVAR " -"DP_HALFLIFE_SPRITE " -"DP_INPUTBUTTONS " -"DP_LIGHTSTYLE_STATICVALUE " -"DP_LITSPRITES " -"DP_LITSUPPORT " -"DP_MONSTERWALK " -"DP_MOVETYPEBOUNCEMISSILE " -"DP_MOVETYPEFLYWORLDONLY " -"DP_MOVETYPEFOLLOW " -"DP_NULL_MODEL " -"DP_QC_ASINACOSATANATAN2TAN " -"DP_QC_AUTOCVARS " -"DP_QC_CHANGEPITCH " -"DP_QC_CMD " -"DP_QC_COPYENTITY " -"DP_QC_CRC16 " -"DP_QC_CVAR_DEFSTRING " -"DP_QC_CVAR_DESCRIPTION " -"DP_QC_CVAR_STRING " -"DP_QC_CVAR_TYPE " -"DP_QC_DIGEST " -"DP_QC_DIGEST_SHA256 " -"DP_QC_EDICT_NUM " -"DP_QC_ENTITYDATA " -"DP_QC_ENTITYSTRING " -"DP_QC_ETOS " -"DP_QC_EXTRESPONSEPACKET " -"DP_QC_FINDCHAIN " -"DP_QC_FINDCHAINFLAGS " -"DP_QC_FINDCHAINFLOAT " -"DP_QC_FINDCHAIN_TOFIELD " -"DP_QC_FINDFLAGS " -"DP_QC_FINDFLOAT " -"DP_QC_FS_SEARCH " -"DP_QC_GETLIGHT " -"DP_QC_GETSURFACE " -"DP_QC_GETSURFACETRIANGLE " -"DP_QC_GETSURFACEPOINTATTRIBUTE " -"DP_QC_GETTAGINFO " -"DP_QC_GETTAGINFO_BONEPROPERTIES " -"DP_QC_GETTIME " -"DP_QC_GETTIME_CDTRACK " -"DP_QC_I18N " -"DP_QC_LOG " -"DP_QC_MINMAXBOUND " -"DP_QC_MULTIPLETEMPSTRINGS " -"DP_QC_NUM_FOR_EDICT " -"DP_QC_RANDOMVEC " -"DP_QC_SINCOSSQRTPOW " -"DP_QC_SPRINTF " -"DP_QC_STRFTIME " -"DP_QC_STRINGBUFFERS " -"DP_QC_STRINGBUFFERS_CVARLIST " -"DP_QC_STRINGBUFFERS_EXT_WIP " -"DP_QC_STRINGCOLORFUNCTIONS " -"DP_QC_STRING_CASE_FUNCTIONS " -"DP_QC_STRREPLACE " -"DP_QC_TOKENIZEBYSEPARATOR " -"DP_QC_TOKENIZE_CONSOLE " -"DP_QC_TRACEBOX " -"DP_QC_TRACETOSS " -"DP_QC_TRACE_MOVETYPE_HITMODEL " -"DP_QC_TRACE_MOVETYPE_WORLDONLY " -"DP_QC_UNLIMITEDTEMPSTRINGS " -"DP_QC_URI_ESCAPE " -"DP_QC_URI_GET " -"DP_QC_URI_POST " -"DP_QC_VECTOANGLES_WITH_ROLL " -"DP_QC_VECTORVECTORS " -"DP_QC_WHICHPACK " -"DP_QUAKE2_MODEL " -"DP_QUAKE2_SPRITE " -"DP_QUAKE3_MAP " -"DP_QUAKE3_MODEL " -"DP_REGISTERCVAR " -"DP_SKELETONOBJECTS " -"DP_SND_DIRECTIONLESSATTNNONE " -"DP_SND_FAKETRACKS " -"DP_SND_SOUND7_WIP1 " -"DP_SND_SOUND7_WIP2 " -"DP_SND_OGGVORBIS " -"DP_SND_SETPARAMS " -"DP_SND_STEREOWAV " -"DP_SND_GETSOUNDTIME " -"DP_VIDEO_DPV " -"DP_VIDEO_SUBTITLES " -"DP_SOLIDCORPSE " -"DP_SPRITE32 " -"DP_SV_BOTCLIENT " -"DP_SV_BOUNCEFACTOR " -"DP_SV_CLIENTCAMERA " -"DP_SV_CLIENTCOLORS " -"DP_SV_CLIENTNAME " -"DP_SV_CMD " -"DP_SV_CUSTOMIZEENTITYFORCLIENT " -"DP_SV_DISABLECLIENTPREDICTION " -"DP_SV_DISCARDABLEDEMO " -"DP_SV_DRAWONLYTOCLIENT " -"DP_SV_DROPCLIENT " -"DP_SV_EFFECT " -"DP_SV_ENTITYCONTENTSTRANSITION " -"DP_SV_MODELFLAGS_AS_EFFECTS " -"DP_SV_MOVETYPESTEP_LANDEVENT " -"DP_SV_NETADDRESS " -"DP_SV_NODRAWTOCLIENT " -"DP_SV_ONENTITYNOSPAWNFUNCTION " -"DP_SV_ONENTITYPREPOSTSPAWNFUNCTION " -"DP_SV_PING " -"DP_SV_PING_PACKETLOSS " -"DP_SV_PLAYERPHYSICS " -"DP_PHYSICS_ODE " -"DP_SV_POINTPARTICLES " -"DP_SV_POINTSOUND " -"DP_SV_PRECACHEANYTIME " -"DP_SV_PRINT " -"DP_SV_PUNCHVECTOR " -"DP_SV_QCSTATUS " -"DP_SV_ROTATINGBMODEL " -"DP_SV_SETCOLOR " -"DP_SV_SHUTDOWN " -"DP_SV_SLOWMO " -"DP_SV_SPAWNFUNC_PREFIX " -"DP_SV_WRITEPICTURE " -"DP_SV_WRITEUNTERMINATEDSTRING " -"DP_TE_BLOOD " -"DP_TE_BLOODSHOWER " -"DP_TE_CUSTOMFLASH " -"DP_TE_EXPLOSIONRGB " -"DP_TE_FLAMEJET " -"DP_TE_PARTICLECUBE " -"DP_TE_PARTICLERAIN " -"DP_TE_PARTICLESNOW " -"DP_TE_PLASMABURN " -"DP_TE_QUADEFFECTS1 " -"DP_TE_SMALLFLASH " -"DP_TE_SPARK " -"DP_TE_STANDARDEFFECTBUILTINS " -"DP_TRACE_HITCONTENTSMASK_SURFACEINFO " -"DP_USERMOVETYPES " -"DP_VIEWZOOM " -"EXT_BITSHIFT " -"FRIK_FILE " -"FTE_CSQC_SKELETONOBJECTS " -"FTE_QC_CHECKPVS " -"FTE_STRINGS " -"KRIMZON_SV_PARSECLIENTCOMMAND " -"NEH_CMD_PLAY2 " -"NEH_RESTOREGAME " -"NEXUIZ_PLAYERMODEL " -"NXQ_GFX_LETTERBOX " -"PRYDON_CLIENTCURSOR " -"TENEBRAE_GFX_DLIGHTS " -"TW_SV_STEPCONTROL " -"ZQ_PAUSE " -"DP_RM_CLIPGROUP " -//"EXT_CSQC " // not ready yet -; +const char *vm_sv_extensions[] = { +"BX_WAL_SUPPORT", +"DP_BUTTONCHAT", +"DP_BUTTONUSE", +"DP_CL_LOADSKY", +"DP_CON_ALIASPARAMETERS", +"DP_CON_BESTWEAPON", +"DP_CON_EXPANDCVAR", +"DP_CON_SET", +"DP_CON_SETA", +"DP_CON_STARTMAP", +"DP_COVERAGE", +"DP_CRYPTO", +"DP_CSQC_BINDMAPS", +"DP_CSQC_ENTITYWORLDOBJECT", +"DP_CSQC_ENTITYMODELLIGHT", +"DP_CSQC_ENTITYTRANSPARENTSORTING_OFFSET", +"DP_CSQC_MAINVIEW", +"DP_CSQC_MINFPS_QUALITY", +"DP_CSQC_MULTIFRAME_INTERPOLATION", +"DP_CSQC_BOXPARTICLES", +"DP_CSQC_SPAWNPARTICLE", +"DP_CSQC_QUERYRENDERENTITY", +"DP_CSQC_ROTATEMOVES", +"DP_CSQC_SETPAUSE", +"DP_CSQC_V_CALCREFDEF_WIP1", +"DP_CSQC_V_CALCREFDEF_WIP2", +"DP_EF_ADDITIVE", +"DP_EF_BLUE", +"DP_EF_DOUBLESIDED", +"DP_EF_DYNAMICMODELLIGHT", +"DP_EF_FLAME", +"DP_EF_FULLBRIGHT", +"DP_EF_NODEPTHTEST", +"DP_EF_NODRAW", +"DP_EF_NOGUNBOB", +"DP_EF_NOSELFSHADOW", +"DP_EF_NOSHADOW", +"DP_EF_RED", +"DP_EF_RESTARTANIM_BIT", +"DP_EF_STARDUST", +"DP_EF_TELEPORT_BIT", +"DP_ENT_ALPHA", +"DP_ENT_COLORMOD", +"DP_ENT_CUSTOMCOLORMAP", +"DP_ENT_EXTERIORMODELTOCLIENT", +"DP_ENT_GLOW", +"DP_ENT_GLOWMOD", +"DP_ENT_LOWPRECISION", +"DP_ENT_SCALE", +"DP_ENT_TRAILEFFECTNUM", +"DP_ENT_VIEWMODEL", +"DP_GFX_EXTERNALTEXTURES", +"DP_GFX_EXTERNALTEXTURES_PERMAP", +"DP_GFX_FOG", +"DP_GFX_MODEL_INTERPOLATION", +"DP_GFX_QUAKE3MODELTAGS", +"DP_GFX_SKINFILES", +"DP_GFX_SKYBOX", +"DP_GFX_FONTS", +"DP_GFX_FONTS_FREETYPE", +"DP_UTF8", +"DP_FONT_VARIABLEWIDTH", +"DP_HALFLIFE_MAP", +"DP_HALFLIFE_MAP_CVAR", +"DP_HALFLIFE_SPRITE", +"DP_INPUTBUTTONS", +"DP_LIGHTSTYLE_STATICVALUE", +"DP_LITSPRITES", +"DP_LITSUPPORT", +"DP_MONSTERWALK", +"DP_MOVETYPEBOUNCEMISSILE", +"DP_MOVETYPEFLYWORLDONLY", +"DP_MOVETYPEFOLLOW", +"DP_NULL_MODEL", +"DP_QC_ASINACOSATANATAN2TAN", +"DP_QC_AUTOCVARS", +"DP_QC_CHANGEPITCH", +"DP_QC_CMD", +"DP_QC_COPYENTITY", +"DP_QC_CRC16", +"DP_QC_CVAR_DEFSTRING", +"DP_QC_CVAR_DESCRIPTION", +"DP_QC_CVAR_STRING", +"DP_QC_CVAR_TYPE", +"DP_QC_DIGEST", +"DP_QC_DIGEST_SHA256", +"DP_QC_EDICT_NUM", +"DP_QC_ENTITYDATA", +"DP_QC_ENTITYSTRING", +"DP_QC_ETOS", +"DP_QC_EXTRESPONSEPACKET", +"DP_QC_FINDBOX", +"DP_QC_FINDCHAIN", +"DP_QC_FINDCHAINFLAGS", +"DP_QC_FINDCHAINFLOAT", +"DP_QC_FINDCHAIN_TOFIELD", +"DP_QC_FINDFLAGS", +"DP_QC_FINDFLOAT", +"DP_QC_FS_SEARCH", +"DP_QC_FS_SEARCH_PACKFILE", +"DP_QC_GETLIGHT", +"DP_QC_GETSURFACE", +"DP_QC_GETSURFACETRIANGLE", +"DP_QC_GETSURFACEPOINTATTRIBUTE", +"DP_QC_GETTAGINFO", +"DP_QC_GETTAGINFO_BONEPROPERTIES", +"DP_QC_GETTIME", +"DP_QC_GETTIME_CDTRACK", +"DP_QC_I18N", +"DP_QC_LOG", +"DP_QC_MINMAXBOUND", +"DP_QC_MULTIPLETEMPSTRINGS", +"DP_QC_NUDGEOUTOFSOLID", +"DP_QC_NUM_FOR_EDICT", +"DP_QC_RANDOMVEC", +"DP_QC_SINCOSSQRTPOW", +"DP_QC_SPRINTF", +"DP_QC_STRFTIME", +"DP_QC_STRINGBUFFERS", +"DP_QC_STRINGBUFFERS_CVARLIST", +"DP_QC_STRINGBUFFERS_EXT_WIP", +"DP_QC_STRINGCOLORFUNCTIONS", +"DP_QC_STRING_CASE_FUNCTIONS", +"DP_QC_STRREPLACE", +"DP_QC_TOKENIZEBYSEPARATOR", +"DP_QC_TOKENIZE_CONSOLE", +"DP_QC_TRACEBOX", +"DP_QC_TRACETOSS", +"DP_QC_TRACE_MOVETYPE_HITMODEL", +"DP_QC_TRACE_MOVETYPE_WORLDONLY", +"DP_QC_UNLIMITEDTEMPSTRINGS", +"DP_QC_URI_ESCAPE", +"DP_QC_URI_GET", +"DP_QC_URI_POST", +"DP_QC_VECTOANGLES_WITH_ROLL", +"DP_QC_VECTORVECTORS", +"DP_QC_WHICHPACK", +"DP_QUAKE2_MODEL", +"DP_QUAKE2_SPRITE", +"DP_QUAKE3_MAP", +"DP_QUAKE3_MODEL", +"DP_REGISTERCVAR", +"DP_SKELETONOBJECTS", +"DP_SND_DIRECTIONLESSATTNNONE", +"DP_SND_FAKETRACKS", +"DP_SND_SOUND7_WIP1", +"DP_SND_SOUND7_WIP2", +"DP_SND_OGGVORBIS", +"DP_SND_SETPARAMS", +"DP_SND_STEREOWAV", +"DP_SND_GETSOUNDTIME", +"DP_VIDEO_DPV", +"DP_VIDEO_SUBTITLES", +"DP_SOLIDCORPSE", +"DP_SPRITE32", +"DP_SV_BOTCLIENT", +"DP_SV_BOUNCEFACTOR", +"DP_SV_CLIENTCAMERA", +"DP_SV_CLIENTCOLORS", +"DP_SV_CLIENTNAME", +"DP_SV_CMD", +"DP_SV_CUSTOMIZEENTITYFORCLIENT", +"DP_SV_DISABLECLIENTPREDICTION", +"DP_SV_DISCARDABLEDEMO", +"DP_SV_DRAWONLYTOCLIENT", +"DP_SV_DROPCLIENT", +"DP_SV_EFFECT", +"DP_SV_ENTITYCONTENTSTRANSITION", +"DP_SV_MODELFLAGS_AS_EFFECTS", +"DP_SV_MOVETYPESTEP_LANDEVENT", +"DP_SV_NETADDRESS", +"DP_SV_NODRAWTOCLIENT", +"DP_SV_ONENTITYNOSPAWNFUNCTION", +"DP_SV_ONENTITYPREPOSTSPAWNFUNCTION", +"DP_SV_PING", +"DP_SV_PING_PACKETLOSS", +"DP_SV_PLAYERPHYSICS", +"DP_PHYSICS_ODE", +"DP_SV_POINTPARTICLES", +"DP_SV_POINTSOUND", +"DP_SV_PRECACHEANYTIME", +"DP_SV_PRINT", +"DP_SV_PUNCHVECTOR", +"DP_SV_QCSTATUS", +"DP_SV_ROTATINGBMODEL", +"DP_SV_SETCOLOR", +"DP_SV_SHUTDOWN", +"DP_SV_SLOWMO", +"DP_SV_SPAWNFUNC_PREFIX", +"DP_SV_WRITEPICTURE", +"DP_SV_WRITEUNTERMINATEDSTRING", +"DP_TE_BLOOD", +"DP_TE_BLOODSHOWER", +"DP_TE_CUSTOMFLASH", +"DP_TE_EXPLOSIONRGB", +"DP_TE_FLAMEJET", +"DP_TE_PARTICLECUBE", +"DP_TE_PARTICLERAIN", +"DP_TE_PARTICLESNOW", +"DP_TE_PLASMABURN", +"DP_TE_QUADEFFECTS1", +"DP_TE_SMALLFLASH", +"DP_TE_SPARK", +"DP_TE_STANDARDEFFECTBUILTINS", +"DP_TRACE_HITCONTENTSMASK_SURFACEINFO" +"DP_USERMOVETYPES", +"DP_VIEWZOOM", +"EXT_BITSHIFT", +"FRIK_FILE", +"FTE_CSQC_SKELETONOBJECTS", +"FTE_QC_CHECKPVS", +"FTE_STRINGS", +"KRIMZON_SV_PARSECLIENTCOMMAND", +"NEH_CMD_PLAY2", +"NEH_RESTOREGAME", +"NEXUIZ_PLAYERMODEL", +"NXQ_GFX_LETTERBOX", +"PRYDON_CLIENTCURSOR", +"TENEBRAE_GFX_DLIGHTS", +"TW_SV_STEPCONTROL", +"ZQ_PAUSE", +"DP_RM_CLIPGROUP", +NULL +//"EXT_CSQC" // not ready yet +}; /* ================= @@ -244,7 +248,7 @@ static void VM_SV_setorigin(prvm_prog_t *prog) { prvm_edict_t *e; - VM_SAFEPARMCOUNT(2, VM_setorigin); + VM_SAFEPARMCOUNT(2, VM_SV_setorigin); e = PRVM_G_EDICT(OFS_PARM0); if (e == prog->edicts) @@ -252,7 +256,7 @@ static void VM_SV_setorigin(prvm_prog_t *prog) VM_Warning(prog, "setorigin: can not modify world entity\n"); return; } - if (e->priv.server->free) + if (e->free) { VM_Warning(prog, "setorigin: can not modify free entity\n"); return; @@ -264,7 +268,7 @@ static void VM_SV_setorigin(prvm_prog_t *prog) } // TODO: rotate param isnt used.. could be a bug. please check this and remove it if possible [1/10/2008 Black] -static void SetMinMaxSize (prvm_prog_t *prog, prvm_edict_t *e, float *min, float *max, qboolean rotate) +static void SetMinMaxSize (prvm_prog_t *prog, prvm_edict_t *e, float *min, float *max, qbool rotate) { int i; @@ -295,7 +299,7 @@ static void VM_SV_setsize(prvm_prog_t *prog) prvm_edict_t *e; vec3_t mins, maxs; - VM_SAFEPARMCOUNT(3, VM_setsize); + VM_SAFEPARMCOUNT(3, VM_SV_setsize); e = PRVM_G_EDICT(OFS_PARM0); if (e == prog->edicts) @@ -303,7 +307,7 @@ static void VM_SV_setsize(prvm_prog_t *prog) VM_Warning(prog, "setsize: can not modify world entity\n"); return; } - if (e->priv.server->free) + if (e->free) { VM_Warning(prog, "setsize: can not modify free entity\n"); return; @@ -325,10 +329,10 @@ static vec3_t quakemins = {-16, -16, -16}, quakemaxs = {16, 16, 16}; static void VM_SV_setmodel(prvm_prog_t *prog) { prvm_edict_t *e; - dp_model_t *mod; + model_t *mod; int i; - VM_SAFEPARMCOUNT(2, VM_setmodel); + VM_SAFEPARMCOUNT(2, VM_SV_setmodel); e = PRVM_G_EDICT(OFS_PARM0); if (e == prog->edicts) @@ -336,7 +340,7 @@ static void VM_SV_setmodel(prvm_prog_t *prog) VM_Warning(prog, "setmodel: can not modify world entity\n"); return; } - if (e->priv.server->free) + if (e->free) { VM_Warning(prog, "setmodel: can not modify free entity\n"); return; @@ -486,6 +490,9 @@ static void VM_SV_ambientsound(prvm_prog_t *prog) if (soundnum >= 256) large = true; + if(sv.protocol == PROTOCOL_NEHAHRABJP) + large = false; + // add an svc_spawnambient command to the level signon packet if (large) @@ -495,7 +502,7 @@ static void VM_SV_ambientsound(prvm_prog_t *prog) MSG_WriteVector(&sv.signon, pos, sv.protocol); - if (large || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3) + if (large || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3) MSG_WriteShort (&sv.signon, soundnum); else MSG_WriteByte (&sv.signon, soundnum); @@ -518,6 +525,7 @@ already running on that entity/channel pair. An attenuation of 0 will play full volume everywhere in the level. Larger attenuations will drop off. +void(entity e, float chan, string samp, float volume[, float atten[, float pitchchange[, float flags]]]) sound (QUAKE) ================= */ static void VM_SV_sound(prvm_prog_t *prog) @@ -800,7 +808,7 @@ static int VM_SV_newcheckclient(prvm_prog_t *prog, int check) // look up the client's edict ent = PRVM_EDICT_NUM(i); // check if it is to be ignored, but never ignore the one we started on (prevent infinite loop) - if (i != check && (ent->priv.server->free || PRVM_serveredictfloat(ent, health) <= 0 || ((int)PRVM_serveredictfloat(ent, flags) & FL_NOTARGET))) + if (i != check && (ent->free || PRVM_serveredictfloat(ent, health) <= 0 || ((int)PRVM_serveredictfloat(ent, flags) & FL_NOTARGET))) continue; // found a valid client (possibly the same one again) break; @@ -847,7 +855,7 @@ static void VM_SV_checkclient(prvm_prog_t *prog) // return check if it might be visible ent = PRVM_EDICT_NUM(sv.lastcheck); - if (ent->priv.server->free || PRVM_serveredictfloat(ent, health) <= 0) + if (ent->free || PRVM_serveredictfloat(ent, health) <= 0) { VM_RETURN_EDICT(prog->edicts); return; @@ -895,7 +903,7 @@ static void VM_SV_checkpvs(prvm_prog_t *prog) VectorCopy(PRVM_G_VECTOR(OFS_PARM0), viewpos); viewee = PRVM_G_EDICT(OFS_PARM1); - if(viewee->priv.server->free) + if(viewee->free) { VM_Warning(prog, "checkpvs: can not check free entity\n"); PRVM_G_FLOAT(OFS_RETURN) = 4; @@ -969,7 +977,7 @@ static void VM_SV_stuffcmd(prvm_prog_t *prog) old = host_client; host_client = svs.clients + entnum-1; - Host_ClientCommands ("%s", string); + SV_ClientCommands ("%s", string); host_client = old; } @@ -999,7 +1007,7 @@ static void VM_SV_findradius(prvm_prog_t *prog) else chainfield = prog->fieldoffsets.chain; if (chainfield < 0) - prog->error_cmd("VM_findchain: %s doesnt have the specified chain field !", prog->name); + prog->error_cmd("VM_SV_findradius: %s doesnt have the specified chain field !", prog->name); chain = (prvm_edict_t *)prog->edicts; @@ -1050,6 +1058,50 @@ static void VM_SV_findradius(prvm_prog_t *prog) VM_RETURN_EDICT(chain); } +/* +================= +VM_SV_findbox + +Returns a chain of entities that are touching a box (a simpler findradius); supports DP_QC_FINDCHAIN_TOFIELD + +findbox (mins, maxs) +================= +*/ +static void VM_SV_findbox(prvm_prog_t *prog) +{ + prvm_edict_t *chain; + int i, numtouchedicts; + static prvm_edict_t *touchedicts[MAX_EDICTS]; + int chainfield; + + VM_SAFEPARMCOUNTRANGE(2, 3, VM_SV_findbox); + + if(prog->argc == 3) + chainfield = PRVM_G_INT(OFS_PARM2); + else + chainfield = prog->fieldoffsets.chain; + if (chainfield < 0) + prog->error_cmd("VM_SV_findbox: %s doesnt have the specified chain field !", prog->name); + + chain = (prvm_edict_t *)prog->edicts; + + numtouchedicts = SV_EntitiesInBox(PRVM_G_VECTOR(OFS_PARM0), PRVM_G_VECTOR(OFS_PARM1), MAX_EDICTS, touchedicts); + if (numtouchedicts > 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) + { + prog->xfunction->builtinsprofile++; + PRVM_EDICTFIELDEDICT(touchedicts[i], chainfield) = PRVM_EDICT_TO_PROG(chain); + chain = touchedicts[i]; + } + + VM_RETURN_EDICT(chain); +} + static void VM_SV_precache_sound(prvm_prog_t *prog) { VM_SAFEPARMCOUNT(1, VM_SV_precache_sound); @@ -1077,7 +1129,7 @@ static void VM_SV_walkmove(prvm_prog_t *prog) vec3_t move; mfunction_t *oldf; int oldself; - qboolean settrace; + qbool settrace; VM_SAFEPARMCOUNTRANGE(2, 3, VM_SV_walkmove); @@ -1090,7 +1142,7 @@ static void VM_SV_walkmove(prvm_prog_t *prog) VM_Warning(prog, "walkmove: can not modify world entity\n"); return; } - if (ent->priv.server->free) + if (ent->free) { VM_Warning(prog, "walkmove: can not modify free entity\n"); return; @@ -1127,12 +1179,18 @@ VM_SV_droptofloor void() droptofloor =============== */ - +inline static qbool droptofloor_bsp_failcond(trace_t *trace) +{ + if (sv.worldmodel->brush.isq3bsp || sv.worldmodel->brush.isq2bsp) + return trace->startsolid; + else + return trace->allsolid || trace->fraction == 1; +} static void VM_SV_droptofloor(prvm_prog_t *prog) { - prvm_edict_t *ent; - vec3_t end, entorigin, entmins, entmaxs; - trace_t trace; + prvm_edict_t *ent; + vec3_t end; + trace_t trace; VM_SAFEPARMCOUNTRANGE(0, 2, VM_SV_droptofloor); // allow 2 parameters because the id1 defs.qc had an incorrect prototype @@ -1145,64 +1203,77 @@ static void VM_SV_droptofloor(prvm_prog_t *prog) VM_Warning(prog, "droptofloor: can not modify world entity\n"); return; } - if (ent->priv.server->free) + if (ent->free) { VM_Warning(prog, "droptofloor: can not modify free entity\n"); return; } - VectorCopy (PRVM_serveredictvector(ent, origin), end); - end[2] -= 256; - if (sv_gameplayfix_droptofloorstartsolid_nudgetocorrect.integer) - SV_NudgeOutOfSolid(ent); - - VectorCopy(PRVM_serveredictvector(ent, origin), entorigin); - VectorCopy(PRVM_serveredictvector(ent, mins), entmins); - VectorCopy(PRVM_serveredictvector(ent, maxs), entmaxs); - trace = SV_TraceBox(entorigin, entmins, entmaxs, end, MOVE_NORMAL, ent, SV_GenericHitSuperContentsMask(ent), 0, 0, collision_extendmovelength.value); - if (trace.startsolid && sv_gameplayfix_droptofloorstartsolid.integer) - { - vec3_t offset, org; - VectorSet(offset, 0.5f * (PRVM_serveredictvector(ent, mins)[0] + PRVM_serveredictvector(ent, maxs)[0]), 0.5f * (PRVM_serveredictvector(ent, mins)[1] + PRVM_serveredictvector(ent, maxs)[1]), PRVM_serveredictvector(ent, mins)[2]); - VectorAdd(PRVM_serveredictvector(ent, origin), offset, org); - trace = SV_TraceLine(org, end, MOVE_NORMAL, ent, SV_GenericHitSuperContentsMask(ent), 0, 0, collision_extendmovelength.value); - VectorSubtract(trace.endpos, offset, trace.endpos); - if (trace.startsolid) - { - Con_DPrintf("droptofloor at %f %f %f - COULD NOT FIX BADLY PLACED ENTITY\n", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2]); - SV_LinkEdict(ent); - PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) | FL_ONGROUND; - PRVM_serveredictedict(ent, groundentity) = 0; - PRVM_G_FLOAT(OFS_RETURN) = 1; - } - else if (trace.fraction < 1) + { + int n = PHYS_NudgeOutOfSolid(prog, ent); + if (!n) + VM_Warning(prog, "droptofloor at \"%f %f %f\": sv_gameplayfix_droptofloorstartsolid_nudgetocorrect COULD NOT FIX badly placed entity \"%s\" before drop\n", PRVM_gameedictvector(ent, origin)[0], PRVM_gameedictvector(ent, origin)[1], PRVM_gameedictvector(ent, origin)[2], PRVM_GetString(prog, PRVM_gameedictstring(ent, classname))); + else if (n > 0) + VM_Warning(prog, "droptofloor at \"%f %f %f\": sv_gameplayfix_droptofloorstartsolid_nudgetocorrect FIXED badly placed entity \"%s\" before drop\n", PRVM_gameedictvector(ent, origin)[0], PRVM_gameedictvector(ent, origin)[1], PRVM_gameedictvector(ent, origin)[2], PRVM_GetString(prog, PRVM_gameedictstring(ent, classname))); + } + + VectorCopy (PRVM_serveredictvector(ent, origin), end); + if (sv.worldmodel->brush.isq3bsp) + end[2] -= 4096; + else if (sv.worldmodel->brush.isq2bsp) + end[2] -= 128; + else + end[2] -= 256; // Quake, QuakeWorld + + /* bones_was_here: not using SV_GenericHitSuperContentsMask(ent) anymore because it was setting: + * items: SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY + * monsters: SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP + * explobox: SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_CORPSE + * which caused (startsolid == true) when, for example, a health was touching a monster. + * Changing MOVE_NORMAL also fixes that, but other engines are using MOVE_NORMAL here. + */ + trace = SV_TraceBox(PRVM_serveredictvector(ent, origin), PRVM_serveredictvector(ent, mins), PRVM_serveredictvector(ent, maxs), end, MOVE_NORMAL, ent, SUPERCONTENTS_SOLID, 0, 0, collision_extendmovelength.value); + if (droptofloor_bsp_failcond(&trace)) + { + if (sv_gameplayfix_droptofloorstartsolid.integer) { - Con_DPrintf("droptofloor at %f %f %f - FIXED BADLY PLACED ENTITY\n", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2]); - VectorCopy (trace.endpos, PRVM_serveredictvector(ent, origin)); + vec3_t offset, org; + + offset[0] = 0.5f * (PRVM_serveredictvector(ent, mins)[0] + PRVM_serveredictvector(ent, maxs)[0]); + offset[1] = 0.5f * (PRVM_serveredictvector(ent, mins)[1] + PRVM_serveredictvector(ent, maxs)[1]); + offset[2] = PRVM_serveredictvector(ent, mins)[2]; + VectorAdd(PRVM_serveredictvector(ent, origin), offset, org); + VectorAdd(end, offset, end); + + trace = SV_TraceLine(org, end, MOVE_NORMAL, ent, SUPERCONTENTS_SOLID, 0, 0, collision_extendmovelength.value); + if (droptofloor_bsp_failcond(&trace)) + { + VM_Warning(prog, "droptofloor at \"%f %f %f\": sv_gameplayfix_droptofloorstartsolid COULD NOT FIX badly placed entity \"%s\"\n", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2], PRVM_GetString(prog, PRVM_gameedictstring(ent, classname))); + return; + } + VM_Warning(prog, "droptofloor at \"%f %f %f\": sv_gameplayfix_droptofloorstartsolid FIXED badly placed entity \"%s\"\n", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2], PRVM_GetString(prog, PRVM_gameedictstring(ent, classname))); + VectorSubtract(trace.endpos, offset, PRVM_serveredictvector(ent, origin)); + + // only because we dropped it without considering its bbox if (sv_gameplayfix_droptofloorstartsolid_nudgetocorrect.integer) - SV_NudgeOutOfSolid(ent); - SV_LinkEdict(ent); - PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) | FL_ONGROUND; - PRVM_serveredictedict(ent, groundentity) = PRVM_EDICT_TO_PROG(trace.ent); - PRVM_G_FLOAT(OFS_RETURN) = 1; - // if support is destroyed, keep suspended (gross hack for floating items in various maps) - ent->priv.server->suspendedinairflag = true; + PHYS_NudgeOutOfSolid(prog, ent); } - } - else - { - if (!trace.allsolid && trace.fraction < 1) + else { - VectorCopy (trace.endpos, PRVM_serveredictvector(ent, origin)); - SV_LinkEdict(ent); - PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) | FL_ONGROUND; - PRVM_serveredictedict(ent, groundentity) = PRVM_EDICT_TO_PROG(trace.ent); - PRVM_G_FLOAT(OFS_RETURN) = 1; - // if support is destroyed, keep suspended (gross hack for floating items in various maps) - ent->priv.server->suspendedinairflag = true; + VM_Warning(prog, "droptofloor at \"%f %f %f\": badly placed entity \"%s\", startsolid: %d allsolid: %d\n", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2], PRVM_GetString(prog, PRVM_gameedictstring(ent, classname)), trace.startsolid, trace.allsolid); + return; } } + else + VectorCopy(trace.endpos, PRVM_serveredictvector(ent, origin)); + + SV_LinkEdict(ent); + PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) | FL_ONGROUND; + PRVM_serveredictedict(ent, groundentity) = PRVM_EDICT_TO_PROG(trace.ent); + PRVM_G_FLOAT(OFS_RETURN) = 1; + // if support is destroyed, keep suspended (gross hack for floating items in various maps) + ent->priv.server->suspendedinairflag = true; } /* @@ -1301,7 +1372,7 @@ static void VM_SV_aim(prvm_prog_t *prog) VM_Warning(prog, "aim: can not use world entity\n"); return; } - if (ent->priv.server->free) + if (ent->free) { VM_Warning(prog, "aim: can not use free entity\n"); return; @@ -1398,11 +1469,21 @@ static sizebuf_t *WriteDest(prvm_prog_t *prog) case MSG_ONE: ent = PRVM_PROG_TO_EDICT(PRVM_serverglobaledict(msg_entity)); entnum = PRVM_NUM_FOR_EDICT(ent); - if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active || !svs.clients[entnum-1].netconnection) + if (entnum < 1 || entnum > svs.maxclients) { VM_Warning(prog, "WriteDest: tried to write to non-client\n"); return &sv.reliable_datagram; } + else if (!svs.clients[entnum-1].active) + { + VM_Warning(prog, "WriteDest: tried to write to a disconnected client\n"); + return &sv.reliable_datagram; + } + else if (!svs.clients[entnum-1].netconnection) + { + VM_Warning(prog, "WriteDest: tried to write to a bot client\n"); + return &sv.reliable_datagram; + } else return &svs.clients[entnum-1].netconnection->message; @@ -1529,7 +1610,7 @@ static void VM_SV_makestatic(prvm_prog_t *prog) VM_Warning(prog, "makestatic: can not modify world entity\n"); return; } - if (ent->priv.server->free) + if (ent->free) { VM_Warning(prog, "makestatic: can not modify free entity\n"); return; @@ -1539,17 +1620,17 @@ static void VM_SV_makestatic(prvm_prog_t *prog) if (PRVM_serveredictfloat(ent, modelindex) >= 256 || PRVM_serveredictfloat(ent, frame) >= 256) large = true; - if (large) + if (sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3) { - MSG_WriteByte (&sv.signon,svc_spawnstatic2); + MSG_WriteByte (&sv.signon,svc_spawnstatic); MSG_WriteShort (&sv.signon, (int)PRVM_serveredictfloat(ent, modelindex)); - MSG_WriteShort (&sv.signon, (int)PRVM_serveredictfloat(ent, frame)); + MSG_WriteByte (&sv.signon, (int)PRVM_serveredictfloat(ent, frame)); } - else if (sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3) + else if (large) { - MSG_WriteByte (&sv.signon,svc_spawnstatic); + MSG_WriteByte (&sv.signon,svc_spawnstatic2); MSG_WriteShort (&sv.signon, (int)PRVM_serveredictfloat(ent, modelindex)); - MSG_WriteByte (&sv.signon, (int)PRVM_serveredictfloat(ent, frame)); + MSG_WriteShort (&sv.signon, (int)PRVM_serveredictfloat(ent, frame)); } else { @@ -1681,6 +1762,8 @@ void VM_SV_UpdateCustomStats (client_t *client, prvm_edict_t *ent, sizebuf_t *ms } } +extern cvar_t sv_gameplayfix_customstats; + // void(float index, float type, .void field) SV_AddStat = #232; // Set up an auto-sent player stat. // Client's get thier own fields sent to them. Index may not be less than 32. @@ -1717,22 +1800,22 @@ static void VM_SV_AddStat(prvm_prog_t *prog) if (i >= MAX_CL_STATS) { - VM_Warning(prog, "PF_SV_AddStat: index (%i) >= MAX_CL_STATS (%i), not supported by protocol, and AddStat beyond MAX_VM_STAT conflicts with engine MOVEVARS\n", i, MAX_CL_STATS, MAX_VM_STAT); + VM_Warning(prog, "PF_SV_AddStat: index (%i) >= MAX_CL_STATS (%i), not supported by protocol, and AddStat beyond MAX_VM_STAT (%i) conflicts with engine MOVEVARS\n", i, MAX_CL_STATS, MAX_VM_STAT); return; } if (i > (MAX_CL_STATS - 4) && type == 1) { - VM_Warning(prog, "PF_SV_AddStat: index (%i) > (MAX_CL_STATS-4) with string type won't fit in the protocol, and AddStat beyond MAX_VM_STAT conflicts with engine MOVEVARS\n", i, MAX_CL_STATS); + VM_Warning(prog, "PF_SV_AddStat: index (%i) > (MAX_CL_STATS (%i) - 4) with string type won't fit in the protocol, and AddStat beyond MAX_VM_STAT conflicts with engine MOVEVARS\n", i, MAX_CL_STATS); return; } // these are hazardous to override but sort of allowed if one wants to be adventurous... and enjoys warnings. if (i < MIN_VM_STAT) VM_Warning(prog, "PF_SV_AddStat: index (%i) < MIN_VM_STAT (%i) may conflict with engine stats - allowed, but this may break things\n", i, MIN_VM_STAT); - else if (i >= MAX_VM_STAT) + else if (i >= MAX_VM_STAT && !sv_gameplayfix_customstats.integer) VM_Warning(prog, "PF_SV_AddStat: index (%i) >= MAX_VM_STAT (%i) conflicts with engine stats - allowed, but this may break slowmo and stuff\n", i, MAX_VM_STAT); - else if (i > (MAX_VM_STAT - 4) && type == 1) + else if (i > (MAX_VM_STAT - 4) && type == 1 && !sv_gameplayfix_customstats.integer) VM_Warning(prog, "PF_SV_AddStat: index (%i) >= MAX_VM_STAT (%i) - 4 with string type won't fit within MAX_VM_STAT, thus conflicting with engine stats - allowed, but this may break slowmo and stuff\n", i, MAX_VM_STAT); vm_customstats[i].type = type; @@ -1760,7 +1843,7 @@ static void VM_SV_copyentity(prvm_prog_t *prog) VM_Warning(prog, "copyentity: can not read world entity\n"); return; } - if (in->priv.server->free) + if (in->free) { VM_Warning(prog, "copyentity: can not read free entity\n"); return; @@ -1771,14 +1854,13 @@ static void VM_SV_copyentity(prvm_prog_t *prog) VM_Warning(prog, "copyentity: can not modify world entity\n"); return; } - if (out->priv.server->free) + if (out->free) { VM_Warning(prog, "copyentity: can not modify free entity\n"); return; } memcpy(out->fields.fp, in->fields.fp, prog->entityfields * sizeof(prvm_vec_t)); - if (VectorCompare(PRVM_serveredictvector(out, absmin), PRVM_serveredictvector(out, absmax))) - return; + SV_LinkEdict(out); } @@ -2351,7 +2433,7 @@ static void VM_SV_clientcommand(prvm_prog_t *prog) temp_client = host_client; host_client = svs.clients + i; - Cmd_ExecuteString(&cmd_serverfromclient, PRVM_G_STRING(OFS_PARM1), src_client, true); + Cmd_ExecuteString(cmd_serverfromclient, PRVM_G_STRING(OFS_PARM1), src_client, true); host_client = temp_client; } @@ -2361,7 +2443,7 @@ static void VM_SV_setattachment(prvm_prog_t *prog) prvm_edict_t *e = PRVM_G_EDICT(OFS_PARM0); prvm_edict_t *tagentity = PRVM_G_EDICT(OFS_PARM1); const char *tagname = PRVM_G_STRING(OFS_PARM2); - dp_model_t *model; + model_t *model; int tagindex; VM_SAFEPARMCOUNT(3, VM_SV_setattachment); @@ -2370,7 +2452,7 @@ static void VM_SV_setattachment(prvm_prog_t *prog) VM_Warning(prog, "setattachment: can not modify world entity\n"); return; } - if (e->priv.server->free) + if (e->free) { VM_Warning(prog, "setattachment: can not modify free entity\n"); return; @@ -2415,7 +2497,7 @@ static int SV_GetTagIndex (prvm_prog_t *prog, prvm_edict_t *e, const char *tagna static int SV_GetExtendedTagInfo (prvm_prog_t *prog, prvm_edict_t *e, int tagindex, int *parentindex, const char **tagname, matrix4x4_t *tag_localmatrix) { int r; - dp_model_t *model; + model_t *model; *tagname = NULL; *parentindex = 0; @@ -2434,7 +2516,7 @@ static int SV_GetExtendedTagInfo (prvm_prog_t *prog, prvm_edict_t *e, int tagind return 1; } -void SV_GetEntityMatrix (prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out, qboolean viewmatrix) +void SV_GetEntityMatrix (prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out, qbool viewmatrix) { float scale; float pitchsign = 1; @@ -2454,7 +2536,7 @@ void SV_GetEntityMatrix (prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out, static int SV_GetEntityLocalTagMatrix(prvm_prog_t *prog, prvm_edict_t *ent, int tagindex, matrix4x4_t *out) { - dp_model_t *model; + model_t *model; if (tagindex >= 0 && (model = SV_GetModelFromEdict(ent)) && model->animscenes) { VM_GenerateFrameGroupBlend(prog, ent->priv.server->framegroupblend, ent); @@ -2473,21 +2555,18 @@ static int SV_GetEntityLocalTagMatrix(prvm_prog_t *prog, prvm_edict_t *ent, int // 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; static int SV_GetTagMatrix (prvm_prog_t *prog, matrix4x4_t *out, prvm_edict_t *ent, int tagindex) { int ret; int modelindex, attachloop; matrix4x4_t entitymatrix, tagmatrix, attachmatrix; - dp_model_t *model; + model_t *model; *out = identitymatrix; // warnings and errors return identical matrix if (ent == prog->edicts) return 1; - if (ent->priv.server->free) + if (ent->free) return 2; modelindex = (int)PRVM_serveredictfloat(ent, modelindex); @@ -2534,29 +2613,6 @@ static int SV_GetTagMatrix (prvm_prog_t *prog, matrix4x4_t *out, prvm_edict_t *e SV_GetEntityMatrix(prog, ent, &entitymatrix, true); Matrix4x4_Concat(out, &entitymatrix, &tagmatrix); - - /* - // Cl_bob, ported from rendering code - if (PRVM_serveredictfloat(ent, health) > 0 && cl_bob.value && cl_bobcycle.value) - { - double bob, cycle; - // LadyHavoc: this code is *weird*, but not replacable (I think it - // should be done in QC on the server, but oh well, quake is quake) - // LadyHavoc: 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(PRVM_serveredictvector(ent, velocity)[0]*PRVM_serveredictvector(ent, velocity)[0] + PRVM_serveredictvector(ent, velocity)[1]*PRVM_serveredictvector(ent, velocity)[1])*cl_bob.value; - bob = bob*0.3 + bob*0.7*cycle; - Matrix4x4_AdjustOrigin(out, 0, 0, bound(-7, bob, 4)); - } - */ } return 0; } @@ -2579,7 +2635,7 @@ static void VM_SV_gettagindex(prvm_prog_t *prog) VM_Warning(prog, "VM_SV_gettagindex(entity #%i): can't affect world entity\n", PRVM_NUM_FOR_EDICT(ent)); return; } - if (ent->priv.server->free) + if (ent->free) { VM_Warning(prog, "VM_SV_gettagindex(entity #%i): can't affect free entity\n", PRVM_NUM_FOR_EDICT(ent)); return; @@ -2609,7 +2665,7 @@ static void VM_SV_gettaginfo(prvm_prog_t *prog) const char *tagname; int returncode; vec3_t forward, left, up, origin; - const dp_model_t *model; + const model_t *model; VM_SAFEPARMCOUNT(2, VM_SV_gettaginfo); @@ -2675,7 +2731,7 @@ static void VM_SV_dropclient(prvm_prog_t *prog) } oldhostclient = host_client; host_client = svs.clients + clientnum; - SV_DropClient(false); + SV_DropClient(false, "Client dropped"); host_client = oldhostclient; } @@ -2710,13 +2766,13 @@ static void VM_SV_clienttype(prvm_prog_t *prog) VM_SAFEPARMCOUNT(1, VM_SV_clienttype); clientnum = PRVM_G_EDICTNUM(OFS_PARM0) - 1; if (clientnum < 0 || clientnum >= svs.maxclients) - PRVM_G_FLOAT(OFS_RETURN) = 3; + PRVM_G_FLOAT(OFS_RETURN) = 3; // CLIENTTYPE_NOTACLIENT else if (!svs.clients[clientnum].active) - PRVM_G_FLOAT(OFS_RETURN) = 0; + PRVM_G_FLOAT(OFS_RETURN) = 0; // CLIENTTYPE_DISCONNECTED else if (svs.clients[clientnum].netconnection) - PRVM_G_FLOAT(OFS_RETURN) = 1; + PRVM_G_FLOAT(OFS_RETURN) = 1; // CLIENTTYPE_REAL else - PRVM_G_FLOAT(OFS_RETURN) = 2; + PRVM_G_FLOAT(OFS_RETURN) = 2; // CLIENTTYPE_BOT } /* @@ -2738,7 +2794,7 @@ static void VM_SV_serverkey(prvm_prog_t *prog) static void VM_SV_setmodelindex(prvm_prog_t *prog) { prvm_edict_t *e; - dp_model_t *mod; + model_t *mod; int i; VM_SAFEPARMCOUNT(2, VM_SV_setmodelindex); @@ -2748,7 +2804,7 @@ static void VM_SV_setmodelindex(prvm_prog_t *prog) VM_Warning(prog, "setmodelindex: can not modify world entity\n"); return; } - if (e->priv.server->free) + if (e->free) { VM_Warning(prog, "setmodelindex: can not modify free entity\n"); return; @@ -2868,13 +2924,26 @@ static void VM_SV_pointparticles(prvm_prog_t *prog) SV_FlushBroadcastMessages(); } +qbool SV_VM_ConsoleCommand (const char *text) +{ + prvm_prog_t *prog = SVVM_prog; + return PRVM_ConsoleCommand(prog, text, &prog->funcoffsets.ConsoleCmd, true, PRVM_EDICT_TO_PROG(sv.world.prog->edicts), sv.time, !(!sv.active || !prog || !prog->loaded), "QC function ConsoleCmd is missing"); +} + +// #352 void(string cmdname) registercommand (EXT_CSQC) +static void VM_SV_registercommand (prvm_prog_t *prog) +{ + VM_SAFEPARMCOUNT(1, VM_SV_registercmd); + Cmd_AddCommand(CF_SERVER, PRVM_G_STRING(OFS_PARM0), NULL, "console command created by QuakeC"); +} + //PF_setpause, // void(float pause) setpause = #531; static void VM_SV_setpause(prvm_prog_t *prog) { int pauseValue; pauseValue = (int)PRVM_G_FLOAT(OFS_PARM0); if (pauseValue != 0) { //pause the game sv.paused = 1; - sv.pausedstart = realtime; + sv.pausedstart = host.realtime; } else { //disable pause, in case it was enabled if (sv.paused != 0) { sv.paused = 0; @@ -2890,7 +2959,7 @@ static void VM_SV_setpause(prvm_prog_t *prog) { static void VM_SV_skel_create(prvm_prog_t *prog) { int modelindex = (int)PRVM_G_FLOAT(OFS_PARM0); - dp_model_t *model = SV_GetModelByIndex(modelindex); + model_t *model = SV_GetModelByIndex(modelindex); skeleton_t *skeleton; int i; PRVM_G_FLOAT(OFS_RETURN) = 0; @@ -2920,7 +2989,7 @@ static void VM_SV_skel_build(prvm_prog_t *prog) float retainfrac = PRVM_G_FLOAT(OFS_PARM3); int firstbone = PRVM_G_FLOAT(OFS_PARM4) - 1; int lastbone = PRVM_G_FLOAT(OFS_PARM5) - 1; - dp_model_t *model = SV_GetModelByIndex(modelindex); + model_t *model = SV_GetModelByIndex(modelindex); int numblends; int bonenum; int blendindex; @@ -3163,7 +3232,7 @@ static void VM_SV_skel_delete(prvm_prog_t *prog) static void VM_SV_frameforname(prvm_prog_t *prog) { int modelindex = (int)PRVM_G_FLOAT(OFS_PARM0); - dp_model_t *model = SV_GetModelByIndex(modelindex); + model_t *model = SV_GetModelByIndex(modelindex); const char *name = PRVM_G_STRING(OFS_PARM1); int i; PRVM_G_FLOAT(OFS_RETURN) = -1; @@ -3183,7 +3252,7 @@ static void VM_SV_frameforname(prvm_prog_t *prog) static void VM_SV_frameduration(prvm_prog_t *prog) { int modelindex = (int)PRVM_G_FLOAT(OFS_PARM0); - dp_model_t *model = SV_GetModelByIndex(modelindex); + model_t *model = SV_GetModelByIndex(modelindex); int framenum = (int)PRVM_G_FLOAT(OFS_PARM1); PRVM_G_FLOAT(OFS_RETURN) = 0; if (!model || !model->animscenes || framenum < 0 || framenum >= model->numframes) @@ -3202,7 +3271,7 @@ VM_SV_setsize, // #4 void(entity e, vector min, vector max) setsize (QUAKE) NULL, // #5 void(entity e, vector min, vector max) setabssize (QUAKE) VM_break, // #6 void() break (QUAKE) VM_random, // #7 float() random (QUAKE) -VM_SV_sound, // #8 void(entity e, float chan, string samp) sound (QUAKE) +VM_SV_sound, // #8 void(entity e, float chan, string samp, float volume[, float atten[, float pitchchange[, float flags]]]) sound (QUAKE) VM_normalize, // #9 vector(vector v) normalize (QUAKE) VM_error, // #10 void(string e) error (QUAKE) VM_objerror, // #11 void(string e) objerror (QUAKE) @@ -3310,7 +3379,7 @@ VM_fclose, // #111 void(float fhandle) fclose (FRIK_FILE) VM_fgets, // #112 string(float fhandle) fgets (FRIK_FILE) VM_fputs, // #113 void(float fhandle, string s) fputs (FRIK_FILE) VM_strlen, // #114 float(string s) strlen (FRIK_FILE) -VM_strcat, // #115 string(string s1, string s2, ...) strcat (FRIK_FILE) +VM_strcat, // #115 string(string s, string...) strcat (FRIK_FILE) VM_substring, // #116 string(string s, float start, float length) substring (FRIK_FILE) VM_stov, // #117 vector(string) stov (FRIK_FILE) VM_strzone, // #118 string(string s) strzone (FRIK_FILE) @@ -3441,7 +3510,7 @@ NULL, // #241 NULL, // #242 NULL, // #243 NULL, // #244 -NULL, // #245 +VM_modulo, // #245 NULL, // #246 NULL, // #247 NULL, // #248 @@ -3549,7 +3618,7 @@ NULL, // #348 string(float playernum, string keyname) getplayerkeyvalue (E NULL, // #349 float() isdemo (EXT_CSQC) VM_isserver, // #350 float() isserver (EXT_CSQC) NULL, // #351 void(vector origin, vector forward, vector right, vector up) SetListener (EXT_CSQC) -NULL, // #352 void(string cmdname) registercommand (EXT_CSQC) +VM_SV_registercommand, // #352 void(string cmdname) registercommand (EXT_CSQC) VM_wasfreed, // #353 float(entity ent) wasfreed (EXT_CSQC) (should be availabe on server too) VM_SV_serverkey, // #354 string(string key) serverkey (EXT_CSQC) NULL, // #355 @@ -3764,8 +3833,8 @@ NULL, // #562 NULL, // #563 NULL, // #564 NULL, // #565 -NULL, // #566 -NULL, // #567 +VM_SV_findbox, // #566 entity(vector mins, vector maxs) findbox = #566; (DP_QC_FINDBOX) +VM_nudgeoutofsolid, // #567 float(entity ent) nudgeoutofsolid = #567; (DP_QC_NUDGEOUTOFSOLID) NULL, // #568 NULL, // #569 NULL, // #570