Prefixed all disability defines with DISABILITY_ to fix a name collision

2017-12-24 15:03:30 -06:00
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
@@ -122,7 +122,11 @@
 	if(L == src)
 		return FALSE

+<<<<<<< HEAD
 	if(disabilities & PACIFISM)
+=======
+	if(has_disability(DISABILITY_PACIFISM))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return FALSE

 	if(enemies[L])