From 2107b65205dbec9522df439f7639c6fe08e54a46 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 1 May 2018 02:21:46 +0000 Subject: [PATCH] Fix a missing newline in system vars mismatch warning. Fix a typo in r_shadow_culllights_trace_pad which made it not work. Fix the name used on index buffers for Mod_ShadowMesh geometry - loadmodel->name doesn't make sense given where this is called. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12410 d7cf8633-e32d-0410-b094-e92efae38249 --- model_shared.c | 4 ++-- r_shadow.c | 2 +- sv_main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/model_shared.c b/model_shared.c index 5fea2298..6adbef62 100644 --- a/model_shared.c +++ b/model_shared.c @@ -1234,11 +1234,11 @@ static void Mod_ShadowMesh_CreateVBOs(shadowmesh_t *mesh, mempool_t *mempool) // upload short indices as a buffer if (mesh->element3s && !mesh->element3s_indexbuffer) - mesh->element3s_indexbuffer = R_Mesh_CreateMeshBuffer(mesh->element3s, mesh->numtriangles * sizeof(short[3]), loadmodel->name, true, false, false, true); + mesh->element3s_indexbuffer = R_Mesh_CreateMeshBuffer(mesh->element3s, mesh->numtriangles * sizeof(short[3]), "shadowmesh", true, false, false, true); // upload int indices as a buffer if (mesh->element3i && !mesh->element3i_indexbuffer && !mesh->element3s) - mesh->element3i_indexbuffer = R_Mesh_CreateMeshBuffer(mesh->element3i, mesh->numtriangles * sizeof(int[3]), loadmodel->name, true, false, false, false); + mesh->element3i_indexbuffer = R_Mesh_CreateMeshBuffer(mesh->element3i, mesh->numtriangles * sizeof(int[3]), "shadowmesh", true, false, false, false); // vertex buffer is several arrays and we put them in the same buffer // diff --git a/r_shadow.c b/r_shadow.c index 05d5377f..dd7114bf 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -332,7 +332,7 @@ cvar_t r_shadow_culllights_trace = {CVAR_SAVE, "r_shadow_culllights_trace", "1", cvar_t r_shadow_culllights_trace_eyejitter = {CVAR_SAVE, "r_shadow_culllights_trace_eyejitter", "16", "offset eye location randomly by this much"}; cvar_t r_shadow_culllights_trace_enlarge = {CVAR_SAVE, "r_shadow_culllights_trace_enlarge", "0", "make light bounds bigger by *(1.0+enlarge)"}; cvar_t r_shadow_culllights_trace_expand = {CVAR_SAVE, "r_shadow_culllights_trace_expand", "8", "make light bounds bigger by this many units"}; -cvar_t r_shadow_culllights_trace_pad = {CVAR_SAVE, "r_shadow_culllights_trace_expand", "8", "accept traces that hit within this many units of the light bounds"}; +cvar_t r_shadow_culllights_trace_pad = {CVAR_SAVE, "r_shadow_culllights_trace_pad", "8", "accept traces that hit within this many units of the light bounds"}; cvar_t r_shadow_culllights_trace_samples = {CVAR_SAVE, "r_shadow_culllights_trace_samples", "16", "use this many traces to random positions (in addition to center trace)"}; cvar_t r_shadow_culllights_trace_tempsamples = {CVAR_SAVE, "r_shadow_culllights_trace_tempsamples", "16", "use this many traces if the light was created by csqc (no inter-frame caching), -1 disables the check (to avoid flicker entirely)"}; cvar_t r_shadow_culllights_trace_delay = {CVAR_SAVE, "r_shadow_culllights_trace_delay", "1", "light will be considered visible for this many seconds after any trace connects"}; diff --git a/sv_main.c b/sv_main.c index f315a3a7..0b81820b 100644 --- a/sv_main.c +++ b/sv_main.c @@ -3913,7 +3913,7 @@ static void SV_VM_Setup(void) // PRVM_ED_FindGlobalOffset_FromStruct(globalvars_t, SetChangeParms); } else - Con_DPrintf("%s: %s system vars have been modified (CRC %i != engine %i), will not load in other engines", prog->name, sv_progs.string, prog->progs_crc, PROGHEADER_CRC); + Con_DPrintf("%s: %s system vars have been modified (CRC %i != engine %i), will not load in other engines\n", prog->name, sv_progs.string, prog->progs_crc, PROGHEADER_CRC); // OP_STATE is always supported on server because we add fields/globals for it prog->flag |= PRVM_OP_STATE; -- 2.39.2