diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-04-04 19:19:40 +0200 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-04-04 19:19:40 +0200 |
| commit | 5ef62f4e351371265ff96ad423332ab38a162a62 (patch) | |
| tree | 0580c73e9599c3f2992eb735d3a220303ac5d022 /src/game | |
| parent | dab8c5f5c46a2f32f1d6e63641bae816850f0cc6 (diff) | |
| parent | d6fa5c74ba80688a3e14d2e099bfb6077323d079 (diff) | |
Merge branch 'damage-feedback'
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_public.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/bg_public.h b/src/game/bg_public.h index fa93839..a04d053 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -1245,6 +1245,6 @@ typedef struct int cmdcmp( const void *a, const void *b ); // damage blob flags -#define DAMAGE_BLOB_FRIENDLY 1 -#define DAMAGE_BLOB_BUILDABLE 2 -#define DAMAGE_BLOB_SPLASH 4 +#define DAMAGE_BLOB_SPLASH 1 // has to be 1 +#define DAMAGE_BLOB_BUILDABLE 2 // has to be 2 +#define DAMAGE_BLOB_FRIENDLY 4 |