PennMUSH Community
Show
Ignore:
Timestamp:
07/08/07 20:50:12 (1 year ago)
Author:
shawnw
Message:

Merged 1.8.3p4 into trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/trunk/hdrs/lock.h

    r919 r1032  
    8181lock_list *getlockstruct(dbref thing, lock_type type); 
    8282void check_zone_lock(dbref player, dbref zone, int noisy); 
     83void define_lock(lock_type name, privbits flags); 
    8384#define L_FLAGS(lock) ((lock)->flags) 
    8485#define L_CREATOR(lock) ((lock)->creator) 
    …… 
    9293     eval_lock(p,x,Examine_Lock))) 
    9394/* The actual magic cookies. */ 
    94 extern const lock_type Basic_Lock; 
    95 extern const lock_type Enter_Lock; 
    96 extern const lock_type Use_Lock; 
    97 extern const lock_type Zone_Lock; 
    98 extern const lock_type Page_Lock; 
    99 extern const lock_type Tport_Lock; 
    100 extern const lock_type Speech_Lock;     /* Who can speak aloud in me */ 
    101 extern const lock_type Listen_Lock;     /* Who can trigger ^s/ahears on me */ 
    102 extern const lock_type Command_Lock;    /* Who can use $commands on me */ 
    103 extern const lock_type Parent_Lock;     /* Who can @parent to me */ 
    104 extern const lock_type Link_Lock;       /* Who can @link to me */ 
    105 extern const lock_type Leave_Lock;      /* Who can leave me */ 
    106 extern const lock_type Drop_Lock;       /* Who can drop me */ 
    107 extern const lock_type Give_Lock;       /* Who can give me */ 
    108 extern const lock_type Mail_Lock;       /* Who can @mail me */ 
    109 extern const lock_type Follow_Lock;     /* Who can follow me */ 
    110 extern const lock_type Examine_Lock;    /* Who can examine visual me */ 
    111 extern const lock_type Chzone_Lock;     /* Who can @chzone to this object? */ 
    112 extern const lock_type Forward_Lock;    /* Who can @forwardlist to object? */ 
    113 extern const lock_type Control_Lock;    /* Who can control this object? */ 
    114 extern const lock_type Dropto_Lock;     /* Who follows the dropto of this room? */ 
    115 extern const lock_type Destroy_Lock;    /* Who can @dest me if I'm dest_ok? */ 
    116 extern const lock_type Interact_Lock; 
    117 extern const lock_type MailForward_Lock;        /* Who can forward mail to me */ 
    118 extern const lock_type Take_Lock;       /* Who can take from the contents of this object? */ 
    119 /* Declare new lock types here! */ 
     95extern lock_type Basic_Lock; 
     96extern lock_type Enter_Lock; 
     97extern lock_type Use_Lock; 
     98extern lock_type Zone_Lock; 
     99extern lock_type Page_Lock; 
     100extern lock_type Tport_Lock; 
     101extern lock_type Speech_Lock;   /* Who can speak aloud in me */ 
     102extern lock_type Listen_Lock;   /* Who can trigger ^s/ahears on me */ 
     103extern lock_type Command_Lock;  /* Who can use $commands on me */ 
     104extern lock_type Parent_Lock;   /* Who can @parent to me */ 
     105extern lock_type Link_Lock;     /* Who can @link to me */ 
     106extern lock_type Leave_Lock;    /* Who can leave me */ 
     107extern lock_type Drop_Lock;     /* Who can drop me */ 
     108extern lock_type Give_Lock;     /* Who can give me */ 
     109extern lock_type Mail_Lock;     /* Who can @mail me */ 
     110extern lock_type Follow_Lock;   /* Who can follow me */ 
     111extern lock_type Examine_Lock;  /* Who can examine visual me */ 
     112extern lock_type Chzone_Lock;   /* Who can @chzone to this object? */ 
     113extern lock_type Forward_Lock;  /* Who can @forwardlist to object? */ 
     114extern lock_type Control_Lock;  /* Who can control this object? */ 
     115extern lock_type Dropto_Lock;   /* Who follows the dropto of this room? */ 
     116extern lock_type Destroy_Lock;  /* Who can @dest me if I'm dest_ok? */ 
     117extern lock_type Interact_Lock; 
     118extern lock_type MailForward_Lock;      /* Who can forward mail to me */ 
     119extern lock_type Take_Lock;     /* Who can take from the contents of this object? */ 
    120120 
    121121#endif                          /* __LOCK_H */