[Havok-checkins] havokmud act.wizard.c, 1.159, 1.160 interpreter.c, 1.154, 1.155

[Greg H. <ho...@us...>]

Update of /cvsroot/havok/havokmud
In directory sc8-pr-cvs17:/tmp/cvs-serv16696

Modified Files:
	act.wizard.c interpreter.c 
Log Message:
added command punish to replace noshout, noooc, freeze, siteban, silence, & nuke.. may need to revise...


Index: act.wizard.c
===================================================================
RCS file: /cvsroot/havok/havokmud/act.wizard.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** act.wizard.c	6 Nov 2007 18:57:50 -0000	1.159
--- act.wizard.c	6 Nov 2007 20:37:29 -0000	1.160
***************
*** 4290,4295 ****
  
      if(!arg) {
!         ch_printf(ch, "Invalid arguments: punish {noshout|noooc|freeze|siteban} {PC Name}\n\r");
!         command_interpreter(ch, "wizhelp punish");
          return;
      }
--- 4290,4295 ----
  
      if(!arg) {
!         ch_printf(ch, "Invalid arguments: punish {noshout|noooc|freeze|siteban|silence} {PC Name}\n\r");
!         /*command_interpreter(ch, "wizhelp punish");*/
          return;
      }
***************
*** 4303,4308 ****
      } else if (!strcmp("siteban", arg)) {
          do_wizlock(ch,message,cmd);
      } else {
!        ch_printf(ch, "Invalid arguments: punish {noshout|noooc|freeze|siteban} {PC Name}\n\r");
         command_interpreter(ch, "wizhelp punish");
      }
--- 4303,4312 ----
      } else if (!strcmp("siteban", arg)) {
          do_wizlock(ch,message,cmd);
+     } else if (!strcmp("silence", arg)) {
+         do_silence(ch,message,cmd);
+     } else if (!strcmp("nuke", arg)) { /* Implementor?? Fix this */
+         do_nuke(ch,message,cmd);
      } else {
!        ch_printf(ch, "Invalid arguments: punish {noshout|noooc|freeze|siteban|silence} {PC Name}\n\r");
         command_interpreter(ch, "wizhelp punish");
      }

Index: interpreter.c
===================================================================
RCS file: /cvsroot/havok/havokmud/interpreter.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** interpreter.c	6 Nov 2007 18:57:51 -0000	1.154
--- interpreter.c	6 Nov 2007 20:37:30 -0000	1.155
***************
*** 441,445 ****
      { "imptest", do_imptest, 249, POSITION_SITTING, 60 , MISC_CMD },
      { "shoot", do_fire, 250, POSITION_STANDING, 1 , MISC_CMD },
!     { "silence", do_silence, 251, POSITION_STANDING, 54 , MISC_CMD },
  #if 0
      { "teams",do_not_here,252,POSITION_STANDING, MAX_IMMORT , MISC_CMD },
--- 441,445 ----
      { "imptest", do_imptest, 249, POSITION_SITTING, 60 , MISC_CMD },
      { "shoot", do_fire, 250, POSITION_STANDING, 1 , MISC_CMD },
!     /*{ "silence", do_silence, 251, POSITION_STANDING, 54 , MISC_CMD },*/
  #if 0
      { "teams",do_not_here,252,POSITION_STANDING, MAX_IMMORT , MISC_CMD },
***************
*** 544,548 ****
      { "carve", do_carve, 335, POSITION_STANDING, 1 , MISC_CMD },
  
!     { "nuke", do_nuke, 336, POSITION_DEAD, IMPLEMENTOR , MISC_CMD },
      { "skills", do_show_skill, 337, POSITION_SLEEPING, 0 , MISC_CMD },
      { "doorway", do_doorway, 338, POSITION_STANDING, 1 , MISC_CMD },
--- 544,548 ----
      { "carve", do_carve, 335, POSITION_STANDING, 1 , MISC_CMD },
  
!     /*{ "nuke", do_nuke, 336, POSITION_DEAD, IMPLEMENTOR , MISC_CMD },*/
      { "skills", do_show_skill, 337, POSITION_SLEEPING, 0 , MISC_CMD },
      { "doorway", do_doorway, 338, POSITION_STANDING, 1 , MISC_CMD },
***************
*** 714,718 ****
  
      { "ooc", do_ooc, 497, POSITION_RESTING, 2 , MISC_CMD },
!     { "noooc", do_plr_noooc, 498, POSITION_SLEEPING, 2 , MISC_CMD },
      /*{ "wiznoooc", do_wiznoooc, 499, POSITION_SLEEPING, 54 , MISC_CMD },*/
  
--- 714,718 ----
  
      { "ooc", do_ooc, 497, POSITION_RESTING, 2 , MISC_CMD },
!     /*{ "noooc", do_plr_noooc, 498, POSITION_SLEEPING, 2 , MISC_CMD },*/
      /*{ "wiznoooc", do_wiznoooc, 499, POSITION_SLEEPING, 54 , MISC_CMD },*/