From 8603a48360a8ad27c781778f2a727dff178ceb82 Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 20 Apr 2012 01:56:30 +0000 Subject: [PATCH] fix a few more redundancies with PRVM_64 git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11808 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=420be816bba26e6457f6c6001f0ceba564e889f0 --- clvm_cmds.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clvm_cmds.c b/clvm_cmds.c index f484a970..bbb29e24 100644 --- a/clvm_cmds.c +++ b/clvm_cmds.c @@ -2736,7 +2736,7 @@ static void VM_CL_ParticleThemeToGlobals(vmparticletheme_t *theme, prvm_prog_t * // VorteX: int only can store 0-255, not 0-256 which means 0 - 0,99609375... VectorSet(PRVM_clientglobalvector(particle_color1), (theme->color1 >> 16) & 0xFF, (theme->color1 >> 8) & 0xFF, (theme->color1 >> 0) & 0xFF); VectorSet(PRVM_clientglobalvector(particle_color2), (theme->color2 >> 16) & 0xFF, (theme->color2 >> 8) & 0xFF, (theme->color2 >> 0) & 0xFF); - PRVM_clientglobalfloat(particle_tex) = (float)theme->tex; + PRVM_clientglobalfloat(particle_tex) = (prvm_vec_t)theme->tex; PRVM_clientglobalfloat(particle_size) = theme->size; PRVM_clientglobalfloat(particle_sizeincrease) = theme->sizeincrease; PRVM_clientglobalfloat(particle_alpha) = theme->alpha/256; @@ -2752,9 +2752,9 @@ static void VM_CL_ParticleThemeToGlobals(vmparticletheme_t *theme, prvm_prog_t * PRVM_clientglobalfloat(particle_stretch) = theme->stretch; VectorSet(PRVM_clientglobalvector(particle_staincolor1), ((int)theme->staincolor1 >> 16) & 0xFF, ((int)theme->staincolor1 >> 8) & 0xFF, ((int)theme->staincolor1 >> 0) & 0xFF); VectorSet(PRVM_clientglobalvector(particle_staincolor2), ((int)theme->staincolor2 >> 16) & 0xFF, ((int)theme->staincolor2 >> 8) & 0xFF, ((int)theme->staincolor2 >> 0) & 0xFF); - PRVM_clientglobalfloat(particle_staintex) = (float)theme->staintex; - PRVM_clientglobalfloat(particle_stainalpha) = (float)theme->stainalpha/256; - PRVM_clientglobalfloat(particle_stainsize) = (float)theme->stainsize; + PRVM_clientglobalfloat(particle_staintex) = (prvm_vec_t)theme->staintex; + PRVM_clientglobalfloat(particle_stainalpha) = (prvm_vec_t)theme->stainalpha/256; + PRVM_clientglobalfloat(particle_stainsize) = (prvm_vec_t)theme->stainsize; PRVM_clientglobalfloat(particle_delayspawn) = theme->delayspawn; PRVM_clientglobalfloat(particle_delaycollision) = theme->delaycollision; PRVM_clientglobalfloat(particle_angle) = theme->angle; -- 2.39.2