From 745d52443390d2e2a1e613db3eea9a9785bcb512 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 22 May 2021 02:42:49 +0200
Subject: [PATCH] Curse of Water now protects from fire

---
 passable.cpp | 2 +-
 pcmove.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/passable.cpp b/passable.cpp
index 90751d0c..36d71ed3 100644
--- a/passable.cpp
+++ b/passable.cpp
@@ -69,7 +69,7 @@ EX int incline(cell *cfrom, cell *cto) {
 EX bool checkflags(flagtype flags, flagtype x) {
   if(flags & x) return true;
   if(flags & P_ISPLAYER) {
-    if((x & P_WINTER)    && markOrb(itOrbWinter)) return true;
+    if((x & P_WINTER)    && (markOrb(itOrbWinter) || markOrb(itCurseWater))) return true;
     if((x & P_IGNORE37)  && markOrb(itOrb37)) return true;
     if((x & P_FISH)      && markOrb(itOrbFish)) return true;
     if((x & P_MARKWATER) && markOrb(itOrbWater)) return true;
diff --git a/pcmove.cpp b/pcmove.cpp
index dca6abf7..6f6ad267 100644
--- a/pcmove.cpp
+++ b/pcmove.cpp
@@ -150,11 +150,11 @@ bool pcmove::checkNeedMove(bool checkonly, bool attacking) {
     if(markOrb2(itOrbAether)) return false;
     if(vmsg()) addMessage(XLAT("The gate is closing right on you! RUN!"));
     }
-  else if(isFire(cwt.at) && !markOrb(itOrbWinter) && !markOrb2(itOrbShield)) {
+  else if(isFire(cwt.at) && !markOrb(itOrbWinter) && !markOrb(itCurseWater) && !markOrb2(itOrbShield)) {
     if(markOrb2(itOrbAether)) return false;
     if(vmsg()) addMessage(XLAT("This spot will be burning soon! RUN!"));
     }
-  else if(cwt.at->wall == waMagma && !markOrb(itOrbWinter) && !markOrb2(itOrbShield)) {
+  else if(cwt.at->wall == waMagma && !markOrb(itOrbWinter) && !markOrb(itCurseWater) && !markOrb2(itOrbShield)) {
     if(markOrb2(itOrbAether)) return false;
     if(in_gravity_zone(cwt.at) && passable(cwt.at, cwt.at, P_ISPLAYER)) return false;
     if(vmsg()) addMessage(XLAT("Run away from the magma!"));