X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=931fc660281e38cf34047c32f4b670744e3b8841;hb=ed17b0043966690a70381680a95b0e51891efa40;hp=4bc2ffed1ff8d586700dd0ce714588d96b2cbbe7;hpb=852587f1186bd4b811d27338622f244fd36ecd60;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.c b/model_shared.c index 4bc2ffed..931fc660 100644 --- a/model_shared.c +++ b/model_shared.c @@ -460,7 +460,7 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk) SCR_PushLoadingScreen(true, mod->name, 1); - // LordHavoc: unload the existing model in this slot (if there is one) + // LadyHavoc: unload the existing model in this slot (if there is one) if (mod->loaded || mod->mempool) Mod_UnloadModel(mod); @@ -527,7 +527,7 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk) } else if (crash) { - // LordHavoc: Sys_Error was *ANNOYING* + // LadyHavoc: Sys_Error was *ANNOYING* Con_Printf ("Mod_LoadModel: %s not found\n", mod->name); } @@ -1431,14 +1431,6 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader) memcpy (&entry->shader, shader, sizeof (q3shaderinfo_t)); } -extern cvar_t mod_noshader_default_offsetmapping; -extern cvar_t mod_q3shader_default_offsetmapping; -extern cvar_t mod_q3shader_default_offsetmapping_scale; -extern cvar_t mod_q3shader_default_offsetmapping_bias; -extern cvar_t mod_q3shader_default_polygonoffset; -extern cvar_t mod_q3shader_default_polygonfactor; -extern cvar_t mod_q3shader_force_addalpha; -extern cvar_t mod_q3shader_force_terrain_alphaflag; void Mod_LoadQ3Shaders(void) { int j; @@ -2473,6 +2465,7 @@ nothing GL_ZERO GL_ONE texture->specularscalemod = shader->specularscalemod; texture->specularpowermod = shader->specularpowermod; texture->rtlightambient = shader->rtlightambient; + texture->refractive_index = mod_q3shader_default_refractive_index.value; if (shader->dpreflectcube[0]) texture->reflectcubetexture = R_GetCubemap(shader->dpreflectcube);