Changeset 19 for src/map/pc.h

Show
Ignore:
Timestamp:
07/02/08 12:20:18 (17 years ago)
Author:
jinshiro
Message:

Now Compiles with Cygwin GCC

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • src/map/pc.h

    r13 r19  
    1 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL 
     1// Copyright (c) Athena Dev Teams - Licensed under GNU GPL =D 
    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 
     117                unsigned showsummon : 1; //Show summoned monster stats [Brainstorm] 
     118======= 
    116119                //Custom Jobs (blackmagic) 
    117120                 
    … …  
    122125                unsigned god :1; //[Sketchy] 
    123126                unsigned demon :1; //[Sketchy] 
     127>>>>>>> .r17 
    124128                bool changemap; 
    125129                struct guild *gmaster_flag;