diff options
| author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:15:10 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:14:47 +0000 |
| commit | acf169219a3f51db82750851cf1dad44ff331de5 (patch) | |
| tree | 28d321632209aa965414c33e873d0ccdabb7e83e /src/qcommon/q_shared.h | |
| parent | b4d3fc69f691cbe19cecf0f3c99e8eed64dc3ddf (diff) | |
* MAX()/MIN() macros need to be wrapped in parenthesis to work as
expected!
* Armour and local damage processing merged
* Armour and local damage scripts now accept a "name" parameter for
debug output
* Norfenstein's non-locational damage formula now perfectly implemented
-- there are restrictions! There can only be ONE layer of armour and all
locational damage region files must cover the entire body and cannot
overlap!
* Turning on g_debugDamage to 2 or 3 provides additional information on
how the damage modifier was calculated
Diffstat (limited to 'src/qcommon/q_shared.h')
| -rw-r--r-- | src/qcommon/q_shared.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 319d8df9..e23f8725 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -636,11 +636,11 @@ vec_t DistanceBetweenLineSegments( float *s, float *t ); #ifndef MAX -#define MAX(x,y) (x)>(y)?(x):(y) +#define MAX(x,y) ((x)>(y)?(x):(y)) #endif #ifndef MIN -#define MIN(x,y) (x)<(y)?(x):(y) +#define MIN(x,y) ((x)<(y)?(x):(y)) #endif //============================================= |