From bde3685210d3e14e19fccc46a24d759d9baa4a6a Mon Sep 17 00:00:00 2001 From: "Timothy C. McGrath" Date: Sun, 8 Sep 2002 02:12:15 +0000 Subject: [PATCH] Reverted the name of petsdrown to allow_watermonsters, and switched the simantics back as well. However, allow_watermonsters still defaults to 1 now. Set to 0 to make monsters drown in water. Tim McGrath --- ai.qc | 2 +- defs.qc | 2 +- often.qc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ai.qc b/ai.qc index 37ce9ac..e39092b 100644 --- a/ai.qc +++ b/ai.qc @@ -193,7 +193,7 @@ void(entity test) AI_Check_Contents = /* WK Removed because water is ok for monsters, sheesh Whatever you think, ceaf it is. */ //- OfN - what the fuck means "ceaf"? heh - else if (pointcontents(test.origin) == CONTENTS_WATER && petsdrown == TRUE) + else if (pointcontents(test.origin) == CONTENTS_WATER && allow_watermonsters == FALSE) { if (self.classname == "monster_demon1") { // do damage diff --git a/defs.qc b/defs.qc index 839fca0..921b111 100644 --- a/defs.qc +++ b/defs.qc @@ -798,7 +798,7 @@ float no_detpush; entity debug_target; // server dprints will go to this client too float allow_debug; //-------------------------// -float petsdrown; // if 0, grunts and monsters can be in water, in check_contents ai.qc +float allow_watermonsters; // if 0, grunts and monsters can be in water, in check_contents ai.qc // Chris' Teamplay Plus Mode /*float chris; // Is Chris mode on or off diff --git a/often.qc b/often.qc index 0c82cdc..66ea86b 100644 --- a/often.qc +++ b/often.qc @@ -165,11 +165,11 @@ void () UpdateInfos = if (army_delay < 2 ) army_delay = 2; // the allowed minimum else if (army_delay > 60) army_delay = 60; //the allowed maximum - st = infokey(NIL, "petsdrown"); // - if (st == "1" || st =="on" ) - petsdrown = 1; + st = infokey(NIL, "allow_watermonsters"); // + if (st == "0" || st =="off" ) + allow_watermonsters = 0; else - petsdrown = 0; + allow_watermonsters = 1; };