Changeset 22 for src/map/pc.c

Timestamp:

07/02/08 22:46:07 (17 years ago)

Author:

jinshiro

Message:

 

Files:

• src/map/pc.c (modified) (5 diffs)

src/map/pc.c

@@ -1 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL =D
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
@@ -754 +754 @@
         if (battle_config.disp_zeny)
                 sd->state.showzeny = 1;
-<<<<<<< .mine
         //Vanaheim settings [Brainstorm]
         if (battle_config.disp_summon_stats) // Battle Flag to Show Summoned Monster Stats [Brain]
         sd->state.showsummon = 1;
 
-=======
-        //Custom Job (blackmagick)      
-        //Vanaheim settings [Brainstorm]
-        if (battle_config.disp_summon_stats) // Battle Flag to Show Summoned Monster Stats [Brain]
-                sd->state.showsummon = 1;
-        
->>>>>>> .r18
         if (!(battle_config.display_skill_fail&2))
                 sd->state.showdelay = 1;
@@ -3898 +3890 @@
                         class_ = MAPID_SUMMER;
                         break;
-<<<<<<< .mine
                         //Possible to be in the wrong spot?
                 case JOB_NECROMANCER: // Necromancer [Brain]
                         class_ |= JOBL_2_1;
                         class_ |= MAPID_ADEPT;
-=======
-                        //Custom Jobs (blackmagic)
-                        +               case JOB_NECROMANCER: // Necromancer [Brain]
-                        class_ |= JOBL_2_1;
-                        class_ |= MAPID_ADEPT;
-                        break;  
-                case JOB_WARLOCK: // Warlock [Brain]
-                        class_ |= JOBL_2_2;
-                case JOB_ADEPT: // Adept [Brain]
-                        class_ |= MAPID_ADEPT;
->>>>>>> .r18
                         break;
                 case JOB_WARLOCK: // Warlock [Brain]
@@ -4139 +4119 @@
         case JOB_NINJA:
                 return msg_txt(620);
-<<<<<<< .mine
         case JOB_ADEPT: // Adept [Brain]
                 return msg_txt(1000);
@@ -4145 +4124 @@
                 return msg_txt(1001);
         case JOB_WARLOCK: // Warlock [Flavio]
-=======
-        //Custom Jobs (blackmagic)
-        case JOB_ADEPT: // Adept [Brain]
-                return msg_txt(1000);
-        case JOB_NECROMANCER: // Necromancer [Brain]
-                return msg_txt(1001);
-        case JOB_WARLOCK: // Warlock [Flavio]
->>>>>>> .r18
                 return msg_txt(1002);