mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-10 15:22:04 +00:00
move the particle count multiplication out of the renderer and into the clien
(for blood and gunshot, anyway).
This commit is contained in:
parent
c2c0353e60
commit
d7675ada7a
6 changed files with 8 additions and 8 deletions
|
@ -281,7 +281,7 @@ R_RunGunshotEffect (vec3_t org, int count)
|
||||||
else
|
else
|
||||||
scale = 16;
|
scale = 16;
|
||||||
|
|
||||||
R_RunSparkEffect (org, count * 10, scale);
|
R_RunSparkEffect (org, count / 2, scale);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -178,10 +178,10 @@ R_RunPuffEffect (vec3_t pos, particle_effect_t type, byte cnt)
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case PE_GUNSHOT:
|
case PE_GUNSHOT:
|
||||||
R_RunParticleEffect (pos, 0, 20 * cnt);
|
R_RunParticleEffect (pos, 0, cnt);
|
||||||
break;
|
break;
|
||||||
case PE_BLOOD:
|
case PE_BLOOD:
|
||||||
R_RunParticleEffect (pos, 73, 20 * cnt);
|
R_RunParticleEffect (pos, 73, cnt);
|
||||||
break;
|
break;
|
||||||
case PE_LIGHTNINGBLOOD:
|
case PE_LIGHTNINGBLOOD:
|
||||||
R_RunParticleEffect (pos, 225, 50);
|
R_RunParticleEffect (pos, 225, 50);
|
||||||
|
|
|
@ -184,10 +184,10 @@ R_RunPuffEffect (vec3_t pos, particle_effect_t type, byte cnt)
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case PE_GUNSHOT:
|
case PE_GUNSHOT:
|
||||||
R_RunParticleEffect (pos, 0, 20 * cnt);
|
R_RunParticleEffect (pos, 0, cnt);
|
||||||
break;
|
break;
|
||||||
case PE_BLOOD:
|
case PE_BLOOD:
|
||||||
R_RunParticleEffect (pos, 73, 20 * cnt);
|
R_RunParticleEffect (pos, 73, cnt);
|
||||||
break;
|
break;
|
||||||
case PE_LIGHTNINGBLOOD:
|
case PE_LIGHTNINGBLOOD:
|
||||||
R_RunParticleEffect (pos, 225, 50);
|
R_RunParticleEffect (pos, 225, 50);
|
||||||
|
|
|
@ -381,7 +381,7 @@ CL_ParseTEnt (void)
|
||||||
if (type == TE_GUNSHOT) {
|
if (type == TE_GUNSHOT) {
|
||||||
cnt = 20;
|
cnt = 20;
|
||||||
} else {
|
} else {
|
||||||
cnt = MSG_ReadByte (net_message);
|
cnt = MSG_ReadByte (net_message) * 20;
|
||||||
}
|
}
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
case TE_LIGHTNINGBLOOD: // lightning hitting body
|
case TE_LIGHTNINGBLOOD: // lightning hitting body
|
||||||
|
|
|
@ -377,7 +377,7 @@ CL_ParseTEnt (void)
|
||||||
|
|
||||||
case TE_GUNSHOT: // bullet hitting wall
|
case TE_GUNSHOT: // bullet hitting wall
|
||||||
case TE_BLOOD: // bullets hitting body
|
case TE_BLOOD: // bullets hitting body
|
||||||
cnt = MSG_ReadByte (net_message);
|
cnt = MSG_ReadByte (net_message) * 20;
|
||||||
case TE_LIGHTNINGBLOOD: // lightning hitting body
|
case TE_LIGHTNINGBLOOD: // lightning hitting body
|
||||||
pos[0] = MSG_ReadCoord (net_message);
|
pos[0] = MSG_ReadCoord (net_message);
|
||||||
pos[1] = MSG_ReadCoord (net_message);
|
pos[1] = MSG_ReadCoord (net_message);
|
||||||
|
|
|
@ -145,7 +145,7 @@ emit_assign_expr (expr_t *e)
|
||||||
memcpy (pr_globals + ofs, pr_globals + def_a->ofs, size);
|
memcpy (pr_globals + ofs, pr_globals + def_a->ofs, size);
|
||||||
def_a->ofs = ofs;
|
def_a->ofs = ofs;
|
||||||
def_a->initialized = 0;
|
def_a->initialized = 0;
|
||||||
warning (e1, "assignment to constant %s", def_a->name);
|
//warning (e1, "assignment to constant %s", def_a->name);
|
||||||
} else {
|
} else {
|
||||||
error (e1, "assignment to constant %s", def_a->name);
|
error (e1, "assignment to constant %s", def_a->name);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue