From 8a72cfcb39dad1bad8cda545dcc7d79bd744a93d Mon Sep 17 00:00:00 2001
From: Rumble <rumble@tbamud.com>
Date: Mon, 18 Jan 2010 16:19:28 +0000
Subject: [PATCH] Fixed bad AFF_SCUBA check for underwater rooms. --Rumble

---
 changelog           | 4 ++++
 lib/world/wld/3.wld | 8 ++++----
 src/act.movement.c  | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 07577ef..6a9b22d 100644
--- a/changelog
+++ b/changelog
@@ -36,6 +36,10 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 @
 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
   Changed mob flag NOBASH to NOKILL.
 [Dec 23 2009] - Rumble
diff --git a/lib/world/wld/3.wld b/lib/world/wld/3.wld
index 0f9c6f9..7746b85 100644
--- a/lib/world/wld/3.wld
+++ b/lib/world/wld/3.wld
@@ -1372,14 +1372,14 @@ D5
 door~
 1 0 225
 E
+sky winds~
+   Cold winds plunge ceaselessly at you from the dark, cloudless sky.
+~
+E
 floor~
    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
 scratch on it.
 ~
-E
-sky winds~
-   Cold winds plunge ceaselessly at you from the dark, cloudless sky.
-~
 S
 $~
diff --git a/src/act.movement.c b/src/act.movement.c
index 4610b43..f5070d0 100644
--- a/src/act.movement.c
+++ b/src/act.movement.c
@@ -104,7 +104,7 @@ int has_scuba(struct char_data *ch)
 
   /* Any equipped objects with AFF_SCUBA will do it too. */
   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 (0);