Changeset 22 for src/map/pc.h

Show
Ignore:
Timestamp:
07/02/08 22:46:07 (17 years ago)
Author:
jinshiro
Message:
 
Files:
1 modified

Legend:

Unmodified
Added
Removed

  • src/map/pc.h

    r19 r22  
    1 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL =D 
     1// Copyright (c) Athena Dev Teams - Licensed under GNU GPL 
    22// For more information, see LICENCE in the main folder 
    33 
    … …  
    114114                unsigned short autolootid; // [Zephyrus] 
    115115                unsigned noks : 3; // [Zeph Kill Steal Protection] 
    116 <<<<<<< .mine 
    117116                unsigned showsummon : 1; //Show summoned monster stats [Brainstorm] 
    118 ======= 
    119                 //Custom Jobs (blackmagic) 
    120                  
    121                 //Vanaheim settings [Brainstorm] 
    122                 unsigned showsummon :1; //Show summoned monster stats [Brainstorm] 
    123                  
    124                 //Custom Job End 
    125                 unsigned god :1; //[Sketchy] 
    126                 unsigned demon :1; //[Sketchy] 
    127 >>>>>>> .r17 
    128117                bool changemap; 
    129118                struct guild *gmaster_flag;