commandrestricthotfix

Certain command restrictiosn such as noguest did not give appropriate
command failure messages.
(cherry picked from commit 0d6d2d043b9dc04e27a16368fe5c632b6df77a26)

diff --git a/game/txt/changes/0.72p2 b/game/txt/changes/0.72p2
index c79c03eadc226dcb0ca9617c915ca8a3e0a78513..7f8294d58b6d39d1f0fb633283665d8752a6ac06 100644 (file)
--- a/game/txt/changes/0.72p2
+++ b/game/txt/changes/0.72p2
@@ -22,3 +22,5 @@ CobraMUSH Version 0.72p2
     * In the event two descriptors were connected to a Guest, and
       one disconnected.  Possible through possesing a Guest using @su. 
       Guest was destroyed even though it was connected. [RLB]
+    * Certain command restrictions that were applied did not give
+      appropriate command failure messages correctly. [RLB]

diff --git a/src/command.c b/src/command.c
index ab316daf6f61f13c6685e2c9e107a5c2ac4e6e0f..2284a5af28c3613a4dd2feebf6615e902e13ba07 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -1735,11 +1735,11 @@ command_check(dbref player, COMMAND_INFO *cmd, switch_mask switches)
 #endif
   if ((cmd->type & CMD_T_NOGUEST) && Guest(player)) {
     mess =  T("Guests cannot do that.");
-    return 0;
+    goto send_error;
   }
   if ((cmd->type & CMD_T_GOD) && (!God(player))) {
     mess =  T("Only God can do that.");
-    return 0;
+    goto send_error;
   }
   switch (Typeof(player)) {
   case TYPE_ROOM: