Remove the CONFIG_CD macro, and enable faketracks unconditionally.

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index 8753a5ebb8f75a5f0bac8c405daaf1dc2db33165..4fad1003ec56325bb0092db482fc11e62dab20a4 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -2385,7 +2385,7 @@ const char *cl_meshentitynames[NUM_MESHENTITIES] =
        "MESH_UI",
 };
 
-void CL_MeshEntities_Restart(void)
+static void CL_MeshEntities_Restart(void)
 {
        int i;
        entity_t *ent;
@@ -2396,7 +2396,7 @@ void CL_MeshEntities_Restart(void)
        }
 }
 
-void CL_MeshEntities_Init(void)
+static void CL_MeshEntities_Init(void)
 {
        int i;
        entity_t *ent;
@@ -2405,8 +2405,8 @@ void CL_MeshEntities_Init(void)
                ent = cl_meshentities + i;
                ent->state_current.active = true;
                ent->render.model = cl_meshentitymodels + i;
-               ent->render.alpha = 1;
-               ent->render.flags = RENDER_SHADOW | RENDER_LIGHT | RENDER_CUSTOMIZEDMODELLIGHT;
+               ent->render.alpha = 0.999999f; // not quite 1 so that MATERIALFLAG_ALPHA is always set.
+               ent->render.flags = RENDER_SHADOW | RENDER_LIGHT;
                ent->render.framegroupblend[0].lerp = 1;
                ent->render.frameblend[0].lerp = 1;
                VectorSet(ent->render.colormod, 1, 1, 1);
@@ -2414,6 +2414,18 @@ void CL_MeshEntities_Init(void)
                VectorSet(ent->render.custommodellight_ambient, 1, 1, 1);
                VectorSet(ent->render.custommodellight_diffuse, 0, 0, 0);
                VectorSet(ent->render.custommodellight_lightdir, 0, 0, 1);
+               VectorSet(ent->render.render_fullbright, 1, 1, 1);
+               VectorSet(ent->render.render_glowmod, 0, 0, 0);
+               VectorSet(ent->render.render_modellight_ambient, 1, 1, 1);
+               VectorSet(ent->render.render_modellight_diffuse, 0, 0, 0);
+               VectorSet(ent->render.render_modellight_specular, 0, 0, 0);
+               VectorSet(ent->render.render_modellight_lightdir, 0, 0, 1);
+               VectorSet(ent->render.render_lightmap_ambient, 0, 0, 0);
+               VectorSet(ent->render.render_lightmap_diffuse, 1, 1, 1);
+               VectorSet(ent->render.render_lightmap_specular, 1, 1, 1);
+               VectorSet(ent->render.render_rtlight_diffuse, 1, 1, 1);
+               VectorSet(ent->render.render_rtlight_specular, 1, 1, 1);
+
                Matrix4x4_CreateIdentity(&ent->render.matrix);
                CL_UpdateRenderEntity(&ent->render);
        }
@@ -2447,7 +2459,7 @@ void CL_MeshEntities_Reset(void)
        }
 }
 
-void CL_MeshEntities_Shutdown(void)
+static void CL_MeshEntities_Shutdown(void)
 {
 }