OasisOLC 1.5 #10 to #11

From: Crimson Wizard (cwizard@GIBLETS.COM)
Date: 09/04/97


I took a little time to diff out the patches, apply everything, and then
diff those patches too... please accept this submission to the list as an
upgrade patch from 10 to 11... I recommend hand adding it, it's very
small.

*** ../src.eliah/medit.c        Thu Aug 28 09:41:36 1997
--- medit.c     Wed Sep  3 19:29:57 1997
***************
*** 21,26 ****
--- 21,33 ----
  #define DEBUG
  #endif

+ /*
+  * Set this to 1 as a last resort to save mobiles.
+  */
+ #if 0
+ #define I_CRASH
+ #endif
+
  /*-------------------------------------------------------------------*/

  /*
***************
*** 320,327 ****
--- 327,341 ----
  #if defined(DEBUG)
      fprintf(stderr, "Attempted free.");
  #endif
+     /*
+      * I have noticed that if you attempt to free a block of memory and you
+      * give free() a pointer other than it was originally given, the program
+      * will crash.  It's a theory for the two free()'s below.
+      */
+ #if !defined(I_CRASH)
      free(mob_index);
      free(mob_proto);
+ #endif
      mob_index = new_index;
      mob_proto = new_proto;
      top_of_mobt++;
***************
*** 353,364 ****
        SHOP_KEEPER(shop)++;

      /*
!      * Update keepers in shops being edited.
       */
      for (dsc = descriptor_list; dsc; dsc = dsc->next)
!       if (dsc->connected == CON_SEDIT)
        if (S_KEEPER(OLC_SHOP(dsc)) >= new_mob_num)
          S_KEEPER(OLC_SHOP(dsc))++;
    }


--- 367,382 ----
        SHOP_KEEPER(shop)++;

      /*
!      * Update keepers in shops being edited and other mobs being edited.
       */
      for (dsc = descriptor_list; dsc; dsc = dsc->next)
!       if (dsc->connected == CON_SEDIT) {
        if (S_KEEPER(OLC_SHOP(dsc)) >= new_mob_num)
          S_KEEPER(OLC_SHOP(dsc))++;
+       } else if (dsc->connected == CON_MEDIT) {
+      if (GET_MOB_RNUM(OLC_MOB(dsc)) > new_mob_num)
+        GET_MOB_RNUM(OLC_MOB(dsc))++;
+       }
    }


*** ../src.eliah/redit.c        Mon Aug 25 23:17:28 1997
--- redit.c     Thu Sep  4 11:04:48 1997
***************
*** 844,856 ****
      break;

    case REDIT_EXIT_NUMBER:
!     number = (atoi(arg));
!     if (number != -1) {
        if ((number = real_room(number)) < 0) {
        send_to_char("That room does not exist, try again : ", d->character);
        return;
        }
-     }
      OLC_EXIT(d)->to_room = number;
      redit_disp_exit_menu(d);
      return;
--- 844,854 ----
      break;

    case REDIT_EXIT_NUMBER:
!     if ((number =atoi(arg)) != -1)
        if ((number = real_room(number)) < 0) {
        send_to_char("That room does not exist, try again : ", d->character);
        return;
        }
      OLC_EXIT(d)->to_room = number;
      redit_disp_exit_menu(d);
      return;
*** ../src.eliah/olc.h  Sat Aug 30 21:49:44 1997
--- olc.h       Thu Sep  4 11:02:45 1997
***************
*** 8,14 ****
   * If you don't want a short explanation of each field in your zone files,
   * change the number below to a 0 instead of a 1.
   */
! #if 1
  #define ZEDIT_HELP_IN_FILE
  #endif

--- 8,14 ----
   * If you don't want a short explanation of each field in your zone files,
   * change the number below to a 0 instead of a 1.
   */
! #if 0
  #define ZEDIT_HELP_IN_FILE
  #endif

--
#!/bin/sh
whois yea.com|grep YEA2|awk '{print $1}'
whois aree.com|grep DOM|awk '{print $1}'
whois aree.com|grep DOM|awk '{print $1}'|cut -c1
whois tm920|grep TM920|awk '{print $4}'|cut -d@ -f1


     +------------------------------------------------------------+
     | Ensure that you have read the CircleMUD Mailing List FAQ:  |
     | http://democracy.queensu.ca/~fletcher/Circle/list-faq.html |
     +------------------------------------------------------------+



This archive was generated by hypermail 2b30 : 12/08/00 PST