Prefixed all disability defines with DISABILITY_ to fix a name collision

2017-12-24 11:45:45 -05:00
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
@@ -65,7 +65,11 @@
 		update_icon()

 	else if(P.is_hot())
+<<<<<<< HEAD
 		if(user.disabilities & CLUMSY && prob(10))
+=======
+		if(user.has_disability(DISABILITY_CLUMSY) && prob(10))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
 				"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
 			user.dropItemToGround(P)