Merge branch 'master' into Mario/rain_fix

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / func / rainsnow.qc

diff --git a/qcsrc/common/mapobjects/func/rainsnow.qc b/qcsrc/common/mapobjects/func/rainsnow.qc
index e348599..12dd6d2 100644 (file)
--- a/qcsrc/common/mapobjects/func/rainsnow.qc
+++ b/qcsrc/common/mapobjects/func/rainsnow.qc
@@ -36,7 +36,7 @@ spawnfunc(func_rain)
        this.angles = '0 0 0';
        set_movetype(this, MOVETYPE_NONE);
        this.solid = SOLID_NOT;
        this.angles = '0 0 0';
        set_movetype(this, MOVETYPE_NONE);
        this.solid = SOLID_NOT;

-       SetBrushEntityModel(this);
+       SetBrushEntityModel(this, true);

        if (!this.cnt)
        {
                this.cnt = 12;
        if (!this.cnt)
        {
                this.cnt = 12;


@@ -76,7 +76,7 @@ spawnfunc(func_snow)
        this.angles = '0 0 0';
        set_movetype(this, MOVETYPE_NONE);
        this.solid = SOLID_NOT;
        this.angles = '0 0 0';
        set_movetype(this, MOVETYPE_NONE);
        this.solid = SOLID_NOT;

-       SetBrushEntityModel(this);
+       SetBrushEntityModel(this, true);

        if (!this.cnt)
        {
                this.cnt = 12;
        if (!this.cnt)
        {
                this.cnt = 12;


@@ -126,7 +126,7 @@ void Draw_Snow(entity this)
 
        if(boxesoverlap(view_origin - maxdist, view_origin + maxdist, this.absmin, this.absmax))
        //if(autocvar_cl_rainsnow_maxdrawdist <= 0 || vdist(vec2(this.origin) - vec2(this.absmin + this.absmax * 0.5), <=, autocvar_cl_rainsnow_maxdrawdist))
 
        if(boxesoverlap(view_origin - maxdist, view_origin + maxdist, this.absmin, this.absmax))
        //if(autocvar_cl_rainsnow_maxdrawdist <= 0 || vdist(vec2(this.origin) - vec2(this.absmin + this.absmax * 0.5), <=, autocvar_cl_rainsnow_maxdrawdist))

-       te_particlesnow(effbox_min, effbox_max, this.velocity, floor(this.count * drawframetime + random()), this.glow_color);
+       te_particlesnow(effbox_min, effbox_max, this.velocity, floor(mycount * drawframetime + random()), this.glow_color);

 }
 
 NET_HANDLE(ENT_CLIENT_RAINSNOW, bool isnew)
 }
 
 NET_HANDLE(ENT_CLIENT_RAINSNOW, bool isnew)