From 0244441adde816d896eb05034b48202bc19e19dd Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sat, 3 Oct 2009 12:17:37 +0000 Subject: * Don't play EV_FALL_FAR sound if dead * Merging some fixes from mgdev, courtesy of Michael "Risujin" Levin: - Ensure SnapVector always snaps downwards, rather than always towards 0 - Don't send score information that won't be displayed - /give poison as a human poisons rather than boosting * Remove some trailing whitespace * Remove some useless intermediate variables in cg_draw.c * Ammo/clips/build timer display depends on primary weapon rather than equipped - (this also fixes bug 3837) --- src/qcommon/q_shared.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/qcommon') diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 84408371..97caa377 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -462,10 +462,6 @@ typedef struct { #define Vector4Copy(a,b) ((b)[0]=(a)[0],(b)[1]=(a)[1],(b)[2]=(a)[2],(b)[3]=(a)[3]) #define Vector4Add(a,b,c) ((c)[0]=(a)[0]+(b)[0],(c)[1]=(a)[1]+(b)[1],(c)[2]=(a)[2]+(b)[2],(c)[3]=(a)[3]+(b)[3]) -// DO NOT USE: Snaps differently depending on whether number is positive or -// negative! -0.5 and 0.5 both snapped to zero! -//#define SnapVector(v) {v[0]=((int)(v[0]));v[1]=((int)(v[1]));v[2]=((int)(v[2]));} - // Snaps the vector to the floor value always, ignoring any weirdness from // snapping negative versus positive numbers #define Floor(fl) ((fl) >= 0.0f ? (int)(fl) : -(int)(-(fl))) -- cgit