More conversion
This commit is contained in:
+10
-10
@@ -39,8 +39,8 @@ static int r_numparticles;
|
||||
static gltexture_t *particletexture, *particletexture1, *particletexture2, *particletexture3; //johnfitz
|
||||
static float texturescalefactor; //johnfitz -- compensate for apparent size of different particle textures
|
||||
|
||||
cvar_t r_particles = {"r_particles","1", CVAR_ARCHIVE}; //johnfitz
|
||||
cvar_t r_quadparticles = {"r_quadparticles","1", CVAR_ARCHIVE}; //johnfitz
|
||||
convar r_particles{"r_particles","1", {.archive = true}}; //johnfitz
|
||||
convar r_quadparticles{"r_quadparticles","1", {.archive = true}}; //johnfitz
|
||||
|
||||
/*
|
||||
===============
|
||||
@@ -57,7 +57,7 @@ int R_ParticleTextureLookup (int x, int y, int sharpness)
|
||||
r = x * x + y * y;
|
||||
r = r > 255 ? 255 : r;
|
||||
a = sharpness * (255 - r);
|
||||
a = q_min(a,255);
|
||||
a = std::min(a,255);
|
||||
return a;
|
||||
}
|
||||
|
||||
@@ -120,7 +120,7 @@ void R_InitParticleTextures (void)
|
||||
R_SetParticleTexture_f -- johnfitz
|
||||
===============
|
||||
*/
|
||||
static void R_SetParticleTexture_f (cvar_t *var)
|
||||
static void R_SetParticleTexture_f (convar *var)
|
||||
{
|
||||
switch ((int)(r_particles.value))
|
||||
{
|
||||
@@ -166,9 +166,9 @@ void R_InitParticles (void)
|
||||
particles = (particle_t *)
|
||||
Hunk_AllocName (r_numparticles * sizeof(particle_t), "particles");
|
||||
|
||||
Cvar_RegisterVariable (&r_particles); //johnfitz
|
||||
Cvar_SetCallback (&r_particles, R_SetParticleTexture_f);
|
||||
Cvar_RegisterVariable (&r_quadparticles); //johnfitz
|
||||
r_particles.inscribe(); //johnfitz
|
||||
r_particles.set_callback(R_SetParticleTexture_f);
|
||||
r_quadparticles.inscribe(); //johnfitz
|
||||
|
||||
R_InitParticleTextures (); //johnfitz
|
||||
}
|
||||
@@ -722,7 +722,7 @@ void CL_RunParticles (void)
|
||||
particle_t *p, *kill;
|
||||
int i;
|
||||
float time1, time2, time3, dvel, frametime, grav;
|
||||
extern cvar_t sv_gravity;
|
||||
extern convar sv_gravity;
|
||||
|
||||
frametime = cl.time - cl.oldtime;
|
||||
time3 = frametime * 15;
|
||||
@@ -829,7 +829,7 @@ void R_DrawParticles (void)
|
||||
float scale;
|
||||
vec3_t up, right, p_up, p_right, p_upright; //johnfitz -- p_ vectors
|
||||
GLubyte color[4], *c; //johnfitz -- particle transparency
|
||||
extern cvar_t r_particles; //johnfitz
|
||||
extern convar r_particles; //johnfitz
|
||||
//float alpha; //johnfitz -- particle transparency
|
||||
|
||||
if (!r_particles.value)
|
||||
@@ -949,7 +949,7 @@ void R_DrawParticles_ShowTris (void)
|
||||
particle_t *p;
|
||||
float scale;
|
||||
vec3_t up, right, p_up, p_right, p_upright;
|
||||
extern cvar_t r_particles;
|
||||
extern convar r_particles;
|
||||
|
||||
if (!r_particles.value)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user