* Removed duplicate entries for Gunslinger and Ninja in msg_athena.conf (since r5506).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14892 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2011/07/09
+	* Removed duplicate entries for Gunslinger and Ninja in msg_athena.conf (since r5506). [Ai4rei]
 2011/07/07
 	* Replaced compress/uncompress inline code (encode_zip/decode_zip) with the respective zlib library calls while keeping 3rdparty calls inside common code (follow up to r14888, related r14808). [Ai4rei]
 2011/07/06

conf/Changelog.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2011/07/09
+	* Rev. 14892 Removed 'msg_athena.conf' messages 619 and 620 (duplicates to 572 and 573) (since r5506). [Ai4rei]
 2011/05/13
 	* Rev. 14812 Added settings 'cashshop_show_points' and 'mail_show_status', both disabled by default, as the messages they control are custom (follow up to r11548 and r12264). [Ai4rei]
 	- Moved custom cash point update messages to 'msg_athena.conf' (IDs 504~506).

conf/msg_athena.conf

@@ -529,8 +529,8 @@
 616: Taekwon
 617: Star Gladiator
 618: Soul Linker
-619: Gunslinger
-620: Ninja
+//619: FREE
+//620: FREE
 621: Summer
 //...
 650: Unknown Job

src/map/pc.c

@@ -4691,7 +4691,8 @@ const char* job_name(int class_)
 		
 	case JOB_WEDDING:
 	case JOB_SUPER_NOVICE:
-
+	case JOB_GUNSLINGER:
+	case JOB_NINJA:
 	case JOB_XMAS:
 		return msg_txt(570 - JOB_WEDDING+class_);
 
@@ -4772,11 +4773,6 @@ const char* job_name(int class_)
 		return msg_txt(617);
 	case JOB_SOUL_LINKER:
 		return msg_txt(618);
-		
-	case JOB_GUNSLINGER:
-		return msg_txt(619);
-	case JOB_NINJA:
-		return msg_txt(620);
 	
 	default:
 		return msg_txt(650);