use world-> rather than sv.world. in World_LinkEdict_AreaGrid

[xonotic/darkplaces.git] / cl_particles.c

diff --git a/cl_particles.c b/cl_particles.c
index 0162ab2efd71fa557fcd971a30f6bcccb2b1b167..06716148f2deffca1eeedb7dee56255bc4372350 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -209,7 +209,7 @@ void CL_Particles_ParseEffectInfo(const char *textstart, const char *textend)
                        argv[arrayindex][0] = 0;
                for (;;)
                {
-                       if (!COM_ParseToken(&text, true))
+                       if (!COM_ParseToken_Simple(&text, true))
                                return;
                        if (!strcmp(com_token, "\n"))
                                break;
@@ -2180,6 +2180,7 @@ void R_DrawParticle_TransparentCallback(const entity_render_t *ent, const rtligh
        R_Mesh_ColorPointer(particle_color4f, 0, 0);
        GL_DepthMask(false);
        GL_DepthRange(0, 1);
+       GL_PolygonOffset(0, 0);
        GL_DepthTest(true);
        GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces