From c1508207905f938966d1f75d188a2d1a24d7f981 Mon Sep 17 00:00:00 2001 From: Ari Johnson Date: Thu, 5 Jun 2008 17:41:56 +0000 Subject: [PATCH] Fixed bug that caused some lock types to incorrectly count recursion depth (cherry picked from commit 4ecade817a359a93c40e83a198ba11adb9d27ec3) --- game/txt/changes/0.73p1 | 2 ++ src/boolexp.c | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/game/txt/changes/0.73p1 b/game/txt/changes/0.73p1 index 4a0546a..1d02a5a 100644 --- a/game/txt/changes/0.73p1 +++ b/game/txt/changes/0.73p1 @@ -9,4 +9,6 @@ CobraMUSH Version 0.73p1 Fixes: * Fixed cstatus() [AEJ] + * Fixed bug that caused some lock types to incorrectly count + recursion depth [AEJ] diff --git a/src/boolexp.c b/src/boolexp.c index 9a8186c..d099b88 100644 --- a/src/boolexp.c +++ b/src/boolexp.c @@ -608,10 +608,9 @@ eval_boolexp(dbref player /* The player trying to pass */ , boolexp_recursion--; break; case OP_TDIVISION: - boolexp_recursion++; /* basicaly what we're doing is if we catch a '+' key * we're going to loop upwards in the players division - * tree & tre to match it to the division lock somewhere + * tree & try to match it to the division lock somewhere * upwards. */ s = (char *) bytecode + arg; @@ -628,14 +627,11 @@ eval_boolexp(dbref player /* The player trying to pass */ , r = (div2 == div); } } - boolexp_recursion--; break; case OP_TPWRGRP: - boolexp_recursion++; s = (char *) bytecode + arg; break; case OP_TLEVEL: - boolexp_recursion++; s = (char *) bytecode + arg; switch (*s) { case '>': @@ -647,7 +643,6 @@ eval_boolexp(dbref player /* The player trying to pass */ , default: r = LEVEL(player) == parse_number(s); } - boolexp_recursion--; break; case OP_TOBJID: { -- 2.30.2