Fixed bad AFF_SCUBA check for underwater rooms. --Rumble

This commit is contained in:
Rumble 2010-01-18 16:19:28 +00:00
parent 6d80a8a12b
commit 8a72cfcb39
3 changed files with 9 additions and 5 deletions

View file

@ -36,6 +36,10 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
(lots of major bugfixes too) (lots of major bugfixes too)
@ @
tbaMUD 3.61 tbaMUD 3.61
[Jan 18 2010] - Rumble
Fixed bad AFF_SCUBA check for underwater rooms.
[Dec 28 2009] - Rumble
Fixed bug where an immortal could cast 'invis' and then be unable to break it with vis.
[Dec 25 2009] - Rumble [Dec 25 2009] - Rumble
Changed mob flag NOBASH to NOKILL. Changed mob flag NOBASH to NOKILL.
[Dec 23 2009] - Rumble [Dec 23 2009] - Rumble

View file

@ -1372,14 +1372,14 @@ D5
door~ door~
1 0 225 1 0 225
E E
sky winds~
Cold winds plunge ceaselessly at you from the dark, cloudless sky.
~
E
floor~ floor~
The stone floor is the same shade of grey as the sky and is completely plain The stone floor is the same shade of grey as the sky and is completely plain
and unscratched. It is probably too hard for anything to leave as much as a and unscratched. It is probably too hard for anything to leave as much as a
scratch on it. scratch on it.
~ ~
E
sky winds~
Cold winds plunge ceaselessly at you from the dark, cloudless sky.
~
S S
$~ $~

View file

@ -104,7 +104,7 @@ int has_scuba(struct char_data *ch)
/* Any equipped objects with AFF_SCUBA will do it too. */ /* Any equipped objects with AFF_SCUBA will do it too. */
for (i = 0; i < NUM_WEARS; i++) for (i = 0; i < NUM_WEARS; i++)
if (GET_EQ(ch, i) && OBJAFF_FLAGGED(obj, AFF_SCUBA)) if (GET_EQ(ch, i) && OBJAFF_FLAGGED(GET_EQ(ch, i), AFF_SCUBA))
return (1); return (1);
return (0); return (0);