Changeset 19 for src/map/status.h

Timestamp:

07/02/08 12:20:18 (17 years ago)

Author:

jinshiro

Message:

Now Compiles with Cygwin GCC

Files:

• src/map/status.h (modified) (2 diffs)

src/map/status.h

@@ -294 +294 @@
         SC_SEVENWIND,
         SC_DEF_RATE,
+        SC_DECREPIFY, // New status [brain]
+        SC_LUST,
+        SC_DARKMOON,
+        SC_REQUIEM,
+        SC_DEATHPACT,
+        SC_ATFIELD,
+        SC_SUFFER,
+        SC_SEARING,
+        SC_IMMOLATE,
+        SC_AGONY,
+        SC_CURSETONGUES,
+        SC_DOOM,
+        SC_CURSEWEAKNESS,
+        SC_CURSEEXHAUST,
+        SC_OVERWHELMING,
+        SC_FEAR,
         SC_SPREGEN,
         SC_WALKSPEED,
+<<<<<<< .mine
+=======
         //Custom Jobs (blackmagic)
         SC_DECREPIFY, // New status [brain]
@@ -314 +332 @@
         SC_FEAR,
 //Custom Job End
+>>>>>>> .r18
         SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
 } sc_type;